Updated to support latest version of SDK