Add stream modularity