Change name of metamodel
Added unmarshall holders and structure