Refactor data collector
Fix service parameter