Modification to reader classes and main app class