Added streaming functionality