Update to FunctionalHelpers (tuples)