[#18] Readers refactoring