Refactor JsonTupleMap