Added GSON functionality