This has nothing to do with Worker and queues, it should be a separate PR