Update design for Stream.py