Adding future payments support