Refactored reader classes.