Added some more server side stuff.