Fix/generate model data