added CNAME and other stuffs