diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
index dce090a..11183c7 100644
--- a/src/datasource-zabbix/datasource.js
+++ b/src/datasource-zabbix/datasource.js
@@ -2,7 +2,7 @@
 import _ from 'lodash';
 import * as dateMath from 'app/core/utils/datemath';
 import * as utils from './utils';
-import metricFunctions from './metricFunctions';
+import * as metricFunctions from './metricFunctions';
 import './zabbixAPI.service.js';
 import './zabbixCache.service.js';
 import './queryProcessor.service.js';
diff --git a/src/datasource-zabbix/metricFunctions.js b/src/datasource-zabbix/metricFunctions.js
index acfef29..aa0351c 100644
--- a/src/datasource-zabbix/metricFunctions.js
+++ b/src/datasource-zabbix/metricFunctions.js
@@ -189,22 +189,20 @@ class FuncInstance {
   }
 }
 
-export default {
-  createFuncInstance: function(funcDef, params) {
-    if (_.isString(funcDef)) {
-      if (!index[funcDef]) {
-        throw { message: 'Method not found ' + name };
-      }
-      funcDef = index[funcDef];
+export function createFuncInstance(funcDef, params) {
+  if (_.isString(funcDef)) {
+    if (!index[funcDef]) {
+      throw { message: 'Method not found ' + name };
     }
-    return new FuncInstance(funcDef, params);
-  },
-
-  getFuncDef: function(name) {
-    return index[name];
-  },
-
-  getCategories: function() {
-    return categories;
+    funcDef = index[funcDef];
   }
-};
+  return new FuncInstance(funcDef, params);
+}
+
+export function getFuncDef(name) {
+  return index[name];
+}
+
+export function getCategories() {
+  return categories;
+}
diff --git a/src/datasource-zabbix/query.controller.js b/src/datasource-zabbix/query.controller.js
index 25f8ac9..98354e2 100644
--- a/src/datasource-zabbix/query.controller.js
+++ b/src/datasource-zabbix/query.controller.js
@@ -1,7 +1,10 @@
 import {QueryCtrl} from 'app/plugins/sdk';
 import _ from 'lodash';
 import * as utils from './utils';
-import metricFunctions from './metricFunctions';
+import * as metricFunctions from './metricFunctions';
+
+import './add-metric-function.directive';
+import './metric-function-editor.directive';
 
 export class ZabbixQueryController extends QueryCtrl {