Updated editor
merged
Updated metamodel