Improvement/3.x/memory monitor