0.6.0 Upgrade