Modified DataRetriever