Improved InputReader