Improve Reader class