WIP Upgrade to 0.4.1 sdk.