Addition of Type and Format classes, as well as the corresponding unit tests
Merge branch 'feature_datamodel' into develop