Updates for latest SDK changes