issue #20044: Start refactoring model to handle new format.