Migrating to Azure SDK 2.1