Implement new model data format (#400)