Add modified metamodel
Add new meta-model
Adapt model
Adapt model and templates to new metamodel