Server changes for cloud deployment