Add back amqp and platform choice