Recent changes made for UM server enviroment