AMQP changes