Upgrade to 0.9+