Removed dependencies to TraitContext