Add ObjectManagerAwareTrait