Removed Gson dependency