Move data collection to service.