Small changes
Renamed a class from EventClient to ClientHandler