Refactor JMXCollector