Updated to support SDK 1.4.2