Adding proper labelling of hosts