Enhancements to google-gson