onSuccess changed to onRetrieval to clarify it's context