[Tested] added stream support