Changes to measurements.xsd and scenario.xsd, model objects updated accordingly