Fix to use ModelUtil.GSON