Upgrade to 0.6.0-SNAPSHOT