Upgraded to Azure SDK 2.4