Refactoring of streaming services and additional enhancements