Updates to use JMX