Improve MBeans discovery