Refactored streaming in controller and streamhandler
Conflicts handled