Minor design changes in RabbitMQ Listener Service