Changes to support new SDK