Add CNAME
config improvements