Modernising cash flow matching