Update to new SDK