Switch to flow-math from spout-math