CNAME refactor