Adding cname support