Refactoring of retrievers