Updated Server and GameHandler