TRAITS MAPPING (UPDATE 1)