Update to work with latest SDK changes.