some changes for GSON