Updated CHAT mappings