Use decorator for add_queues