Add limiting on streams for production