Feature/tenant queues

Do you need to uncomment this?