Update trade to return user obejcts instead of user ids