Refactor models to be split into models vs fields, in order to eliminate partial instantiation