Add `queueName` property and improve style