Modify to use the new SDK