Updated CHAT mapping