Support for SDK 6.1