Basic reader changes.
PS. Refactoring in still left ReaderContent.java