Better ROI handling in ChangeMatrix module