Update to use new SDK libraries