Updated for RabbitMQ 3+