More prep-work for multi-field (within entity, and outside entity)