Upgrade to v0.11