Refactor, test integration with through-streams