re-add ObjectManagerAwareTrait