Removed client_host, added client_host_adder