Updated heartbeat mapping and attribute lexicon