Updated to use the data-stream attribute