Re-introduce feature: optional streams