More work on Trade Component.