Update to use Calculators for flows.