added Portfolio and TradeAccount types