Update cfs & heartbeat mapping, & attribute lexicon