Migrate to SDK 2.0