adding override_hostname and override_ip