Added schedulers and ability to get stream directly