Upgrade from 1.9 to 2.0