Add queues, fix hashing