Update to Azure 2.3