simplify old metamodel
add datatypes to metamodel
stuff