Refined the EMF metamodel a bit