More work on the exchange plugin.