Add support for fallback stream