Adds streaming support