Add support for 'waterfall' flow