Added in controller and streaming functionality