Implement a less hacky solution for streaming