Add initial retrieval code