Upgrade to SDK 2.0