Fix up property names and add exchange rate