Added --host_identifier option