Simplifying code based on fact that Gson >=1.7 will convert all numbers to Double