Some metamodel extensions
Metamodel extensions
Test fix