Even more work on trade component