Add support for SDK 8.1