Include direclty within DataRetrieverService