Added links and single hostname reference