Added some server stuff