More work on the AMQP listener