fix the issue related to NotSerializableException: com.google.gson.internal.LinkedTreeMap$1
fix the class type
fix issue 36