Simplify Reader to single class