Readd CNAME support