refactorsed unimodels fields_by_ data structures