Changed target of SecurityMarketPriceFunction from Position to PositionOrTrade