Amqp driver message refactoring