add Swap and Commission to Trade class