[Rework] Intial rework to streams throughout webservice