Updated CHAT and heartbeat mappings