Changed name of ConnectionHandler to Connection