Improve CNAME parsing