Added some server code