Porting to SDK 2.0 Beta 2