Added tools for streaming