Updated for azure