Refactored controllers to work correctly with new QueueService