Adding more flow infrastructure