Add more stream functionality