Some Improvements for google-gson usage