Added preliminary version of new metamodel
Cleanup