More work on Exchange table.