Add support for individual hostnames