Fix GenerateModelData class
Fix class extension