Renamed client_connector into client_handler