QueueEngine - small refactor
QueueEngine - more small refactor