Add support for omain names