Support for SDK 2.0 BETA 2