Added Server class