Compatibility for SDK 2.0