Update for SDK 0.5.12