diff --git a/.gitignore b/.gitignore
index d64dacc..1beaf89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 node_modules/
 dist/
-exported/*.csv
-exported/*.json
+exported/
 api-keys.json
 package-lock.json
diff --git a/src/grafana-datasource-kit/grafana_service.ts b/src/grafana-datasource-kit/grafana_service.ts
index a2108f9..e105066 100644
--- a/src/grafana-datasource-kit/grafana_service.ts
+++ b/src/grafana-datasource-kit/grafana_service.ts
@@ -13,7 +13,7 @@ const CHUNK_SIZE = 50000;
  */
 export async function queryByMetric(
   metric: GrafanaMetric, panelUrl: string, from: number, to: number
-): Promise<[number, number][]> {
+) {
 
   let datasource = metric.datasource;
 
@@ -21,14 +21,20 @@ export async function queryByMetric(
   let url = `${origin}/${datasource.url}`;
 
   let params = datasource.params
-  let data = [];
+  let data = {
+    values: [],
+    columns: []
+  };
 
   let chunkParams = Object.assign({}, params);
   while(true) {
-    chunkParams.q = metric.metricQuery.getQuery(from, to, CHUNK_SIZE, data.length);
+    chunkParams.q = metric.metricQuery.getQuery(from, to, CHUNK_SIZE, data.values.length);
     var chunk = await queryGrafana(url, chunkParams);
-    data = data.concat(chunk);
-    if(chunk.length < CHUNK_SIZE) {
+    let values = chunk.values;
+    data.values = data.values.concat(values);
+    data.columns = chunk.columns;
+
+    if(values.length < CHUNK_SIZE) {
       // because if we get less that we could, then there is nothing more
       break;
     }
@@ -38,7 +44,8 @@ export async function queryByMetric(
 }
 
 async function queryGrafana(url: string, params: any) {
-  let headers = { Authorization: `Bearer ${getApiKey(url)}` };
+  let origin = new URL(url).origin;
+  let headers = { Authorization: `Bearer ${getApiKey(origin)}` };
 
   try {
     var res = await axios.get(url, { params, headers });
@@ -59,5 +66,5 @@ async function queryGrafana(url: string, params: any) {
     return [];
   }
 
-  return results.series[0].values as [number, number][];
+  return results.series[0];
 }
diff --git a/src/routes/tasks.ts b/src/routes/tasks.ts
index d3af128..c609b90 100644
--- a/src/routes/tasks.ts
+++ b/src/routes/tasks.ts
@@ -7,6 +7,10 @@ async function addTask(req, res) {
   let body = req.body;
   let from = parseInt(body.from);
   let to = parseInt(body.to);
+  let panelUrl = body.panelUrl;
+  let targets = [body.target];
+  let datasource = body.datasourceRequest;
+  let user = body.user;
 
   if(isNaN(from) || isNaN(to)) {
     res.status(500).send('Range error: please fill both "from" and "to" fields');
@@ -14,8 +18,7 @@ async function addTask(req, res) {
     res.status(500).send('Range error: "from" should be less than "to"');
   } else {
     res.status(200).send('Task added');
-    let grafanaUrl = req.get('origin');
-    let target = new Target(grafanaUrl, body.user, body.datasource, body.measurement, body.query, from, to);
+    let target = new Target(panelUrl, user, datasource, targets, from, to);
     target.export();
   }
 }
diff --git a/src/target.ts b/src/target.ts
index bdfb6ed..2c3fc53 100644
--- a/src/target.ts
+++ b/src/target.ts
@@ -1,5 +1,5 @@
 import { queryByMetric } from './grafana-datasource-kit/grafana_service';
-import { GrafanaDatasource } from './grafana-datasource-kit/grafana_metric_model';
+import { GrafanaDatasource, GrafanaMetric } from './grafana-datasource-kit/grafana_metric_model';
 
 import * as csv from 'fast-csv';
 import * as path from 'path';
@@ -14,26 +14,17 @@ export class Target {
   private days: number;
   private day: number;
   private csvStream: any;
-  private _datasource: GrafanaDatasource;
+  private metric: GrafanaMetric;
 
   constructor(
-    panelUrl: string,
+    private panelUrl: string,
     private user: string,
-    datasource: string,
-    private measurement: string,
-    private query: string,
+    datasource: GrafanaDatasource,
+    targets: Array<Object>,
     private from: number,
     private to: number
-  ) { 
-    this._datasource = {
-      url: panelUrl,
-      type: type,
-      params: {
-        db: string,
-        q: string,
-        epoch: string
-      }
-    }
+  ) {
+    this.metric = new GrafanaMetric(datasource, targets);
   }
 
   public updateStatus(status) {
@@ -41,8 +32,6 @@ export class Target {
     let data = {
       time,
       user: this.user,
-      datasource: this.datasource,
-      measurement: this.measurement,
       exportedRows: this.exportedRows,
       progress: (this.day / this.days).toLocaleString('en', { style: 'percent' }),
       status
@@ -75,11 +64,9 @@ export class Target {
 
       console.log(`${this.day} day: ${from}ms -> ${to}ms`);
 
-      let currentQuery = this.query.replace('$timeFilter', `time >= ${from}ms AND time <= ${to}ms`).replace('$__interval', '1s');
-      let metrics = await queryByMetric(this.datasource, currentQuery);
+      let metrics = await queryByMetric(this.metric, this.panelUrl, from, to);
 
-      console.log(metrics);
-      if(metrics.length > 0) {
+      if(metrics.values.length > 0) {
         if(metrics !== undefined) {
           this.writeCsv(metrics);
         }
@@ -103,22 +90,20 @@ export class Target {
   }
 
   private writeCsv(series) {
-    for(let serie of series) {
-      for(let val of serie.values) {
-        if(val[1] !== null) {
-          let row = {};
-          for(let col in serie.columns) {
-            row[serie.columns[col]] = val[col];
-          }
-          this.csvStream.write(row);
-          this.exportedRows++;
+    for(let val of series.values) {
+      if(val[1] !== null) {
+        let row = {};
+        for(let col in series.columns) {
+          row[series.columns[col]] = val[col];
         }
+        this.csvStream.write(row);
+        this.exportedRows++;
       }
     }
   }
 
   private getFilename(extension) {
-    return `${this.datasource}.${this.measurement}.${this.from}-${this.to}.${extension}`;
+    return `${this.from}-${this.to}.${extension}`;
   }
 
   private getFilePath(extension) {