Updates to the streams design