Removed inclusion of metamodel where not strictly required