Refactor - Update retriever function name