Updated Heartbeat and CFS mapping files