Re-imported MM scenarios per new model-elements

Also includes some utility functions not included in previous merge for some reason