Added JMX support