Consolidate mbeanextract & mxbeanextract