Updated Heartbeat mappings