Refactored data retriever