Updates to Server class