Moving GSON to newer version
Fixing GSON serialization issues