Added new functions to Server class