[SJS-198][WIP]: Added more stream options