Merging in scenario and mesurement schema changes