Add CNAME support