updated CFS mapping and attribute lexicon