Stream support added