Make option host-name optional