Changes to prepare for deployment to Azure