Update for new SDK