Refactor MBean export