More Traits fetched from TraitModel
Merge remote-tracking branch 'origin/master'