Changes to upgrade to 0.10