Update to use latest SDK