[#218] Add new forward looking numerator and denominator calculations