Swap json marshalling system out for gson implementation