Rename Attributes to AttributeDefinitions
Merge branch 'feature/metamodel'