Feature/3.x/improved jmx