RabbitMQ - improved