Added ModelData generator
Added ModelData token generator
Merge branch 'feature/modeldata' into develop