Work on performance optimizations for streams - should be 30% faster to initial load