Added a couple of attributes to the metamodel