Substantial simplification of the data model from the scenario_damage calculator