Refactor streaming dependency