Added logging to Server