Base stream refactoring