Upgrade to 0.8-SNAPSHOT