Added queues and more arrays