Added more support for rabbitmq