Created structure for trade data. Minor updates to trade data loader