Add Stream support