put TradeType in Trade, prepare for historical data