Refactoring: add ModelInfo datatype