Added ability to go through the actual hostnames