f302a262a662 simplyfied models and used definitions, refactoring for generic use