Added SDK 17 support