Updates for new SDK.