Initial changes for SDK 2