Added support for micro-queue