Enhance: Reader class hierarchy redesigned to support more than just file readers