Refactored stream services.