We are using a newer version of gson, so update stuff to work with that.