Update to use with SDK 1.8.1