enhanced ConnectionHandler