Refactored image retrieval process...