added more fields, exchange rate not working yet