Added CNAME support