Added some Server features