Tech Debt: Added CNAME