Adding support for cnames