Correct client configuration
Improve DataCollector