Making changes so that it will be compatible with Azure.