Some issues fixed, metamodel modified