added gson stuff. See Billy if does not work