Changed database.trades to reflect new trade model