Added more JMX stuff