Refactor again using json.RawMessage instead