adapted to new xmi version, minor changes