Moving to SDK 0.4.x