Improvements resolving input stream