Added Server Manager and server