Changed some uses of IGenericTraitCollection to TraitMap