Renaming classes and added reader caching