Refactored RabbitMQ and service descriptions out