Improvement/2.x/queue monitoring