Added more functionality to server