refactored AcitivityFetcher