updated to use GsonHelper from core