Rolled back API to remove references to modelFactory. It's simpler to think of these data structures simply as models.