Added some server changes