Now handles decimals (as strings), and different named ID fields