Adding the "streaming" option