Make streams optional