Add GsonUtil class and convert usages to it