Added CNAME and modified template