Fixed Reader class