Added TODO foe hosts, hostname