Updated to latest SDK changes