Enhance retrieve verification.