Refactor retrieval methods