Update code to work with latest SDK versions.