Fix retrieval methods