Integrate with Azure Sdk 2.4