Refactoring and partial implementation of read operations.