Fixed timeouts and support for more streams