Refactor for single RabbitMQ instance