More streams refactor