Changed JSON dumping to just take the whole data structure.