Server changes for cloud deployment

Server changes for cloud deployment