Doing it this way is at least closer to (although not quite) the format used in the model class redesign I'm working on.