Added support for data to metamodel