Improve flow collection