Add support for hostnames and domains