Added some server functionality