Adding back CNAME for #17