Refactor out finding / dynamically creating a new stream class