Rework all classes to convert OD pair in ODP entity (disaggregate origin-destination pairs in origin-destination-product category entities). Parameters and other parts of the logic of the model may still need to be modified.