Add CNAME and more components