diff --git a/ng2-components/ng2-alfresco-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-alfresco-activiti-form/src/components/activiti-form.component.ts
index 2b84b30eb8..48008a0b9d 100644
--- a/ng2-components/ng2-alfresco-activiti-form/src/components/activiti-form.component.ts
+++ b/ng2-components/ng2-alfresco-activiti-form/src/components/activiti-form.component.ts
@@ -21,9 +21,11 @@ import {
     AfterViewChecked
 } from '@angular/core';
 import { FormService } from './../services/form.service';
-import { WIDGET_DIRECTIVES } from './widgets/index';
 import { FormModel } from './widgets/widget.model';
 
+import { TabsWidget } from './widgets/tabs/tabs.widget';
+import { ContainerWidget } from './widgets/container/container.widget';
+
 declare let __moduleName: string;
 declare var componentHandler;
 
@@ -32,7 +34,7 @@ declare var componentHandler;
     selector: 'activiti-form',
     templateUrl: './activiti-form.component.html',
     styleUrls: ['./activiti-form.component.css'],
-    directives: [WIDGET_DIRECTIVES],
+    directives: [ContainerWidget, TabsWidget],
     providers: [
         FormService
     ]
diff --git a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/index.ts b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/index.ts
index a5415e935a..691e1ffb36 100644
--- a/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/index.ts
+++ b/ng2-components/ng2-alfresco-activiti-form/src/components/widgets/index.ts
@@ -15,13 +15,6 @@
  * limitations under the License.
  */
 
-import { TabsWidget } from './tabs/tabs.widget';
-import { ContainerWidget } from './container/container.widget';
-import { TextWidget } from './text/text.widget';
-import { NumberWidget } from './number/number.widget';
-import { CheckboxWidget } from './checkbox/checkbox.widget';
-import { MultilineTextWidget } from './multiline-text/multiline-text.widget';
-
 export * from './widget.model';
 
 export * from './tabs/tabs.widget';
@@ -30,12 +23,3 @@ export * from './text/text.widget';
 export * from './number/number.widget';
 export * from './checkbox/checkbox.widget';
 export * from './multiline-text/multiline-text.widget';
-
-export const WIDGET_DIRECTIVES: [any] = [
-    TabsWidget,
-    ContainerWidget,
-    TextWidget,
-    NumberWidget,
-    CheckboxWidget,
-    MultilineTextWidget
-];