Refactor input classes to take any input, not just a stream