Add dependencies to metamodel; Bugfixing