Stream support added.