diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java
new file mode 100644
index 0000000..afcf972
--- /dev/null
+++ b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java
@@ -0,0 +1,231 @@
+/**
+ * This file is a part of EpnTAPClient.
+ * This program aims to provide EPN-TAP support for software clients, like CASSIS spectrum analyzer.
+ * See draft specifications: https://voparis-confluence.obspm.fr/pages/viewpage.action?pageId=559861
+ * Copyright (C) 2016 Institut de Recherche en Astrophysique et Planétologie.
+ *
+ * This program is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version. This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details. You should have received a copy of
+ * the GNU General Public License along with this program. If not, see
+ * .
+ */
+package eu.omp.irap.vespa.epntapclient.votable.controller;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.Vector;
+
+import com.google.gson.Gson;
+
+import eu.omp.irap.vespa.epntapclient.utils.Log;
+import eu.omp.irap.vespa.epntapclient.votable.model.DataType;
+import eu.omp.irap.vespa.epntapclient.votable.model.Field;
+import eu.omp.irap.vespa.epntapclient.votable.model.Stream;
+import eu.omp.irap.vespa.epntapclient.votable.model.Table;
+import eu.omp.irap.vespa.epntapclient.votable.model.TableData;
+
+/**
+ * @author N. Jourdane
+ */
+public class VOTableDataParser {
+
+ /**
+ * A list of arrays, representing data stored in the VOTable. Each element is a VOTable row,
+ * where arrays elements are in the same order as `columnNames`.
+ */
+ private Vector