diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts
index 630496531d..2ee4b5da01 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts
@@ -19,14 +19,7 @@ import { Component, Input, AfterViewInit } from '@angular/core';
 import { ContainerModel } from './../widget.model';
 
 import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
-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';
-import { DropdownWidget } from './../dropdown/dropdown.widget';
-import { HyperlinkWidget } from './../hyperlink/hyperlink.widget';
-import { RadioButtonsWidget } from './../radio-buttons/radio-buttons.widget';
-import { DisplayValueWidget } from './../display-value/display-value.widget';
+import { PRIMITIVE_WIDGET_DIRECTIVES } from './../index';
 
 declare let __moduleName: string;
 declare var componentHandler;
@@ -38,14 +31,7 @@ declare var componentHandler;
     styleUrls: ['./container.widget.css'],
     directives: [
         MATERIAL_DESIGN_DIRECTIVES,
-        TextWidget,
-        NumberWidget,
-        CheckboxWidget,
-        MultilineTextWidget,
-        DropdownWidget,
-        HyperlinkWidget,
-        RadioButtonsWidget,
-        DisplayValueWidget
+        PRIMITIVE_WIDGET_DIRECTIVES
     ]
 })
 export class ContainerWidget implements AfterViewInit {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/index.ts b/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
index eff190fa36..fde05ea294 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
@@ -15,10 +15,29 @@
  * 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';
+import { DropdownWidget } from './dropdown/dropdown.widget';
+import { HyperlinkWidget } from './hyperlink/hyperlink.widget';
+import { RadioButtonsWidget } from './radio-buttons/radio-buttons.widget';
+import { DisplayValueWidget } from './display-value/display-value.widget';
+
+// core
+export * from './widget.component';
+
+// model
 export * from './widget.model';
 
+// containers
 export * from './tabs/tabs.widget';
 export * from './container/container.widget';
+
+// primitives
 export * from './text/text.widget';
 export * from './number/number.widget';
 export * from './checkbox/checkbox.widget';
@@ -26,3 +45,22 @@ export * from './multiline-text/multiline-text.widget';
 export * from './dropdown/dropdown.widget';
 export * from './hyperlink/hyperlink.widget';
 export * from './radio-buttons/radio-buttons.widget';
+export * from './display-value/display-value.widget';
+
+export const CONTAINER_WIDGET_DIRECTIVES: [any] = [
+    TabsWidget,
+    ContainerWidget
+];
+
+export const PRIMITIVE_WIDGET_DIRECTIVES: [any] = [
+    TextWidget,
+    NumberWidget,
+    CheckboxWidget,
+    MultilineTextWidget,
+    DropdownWidget,
+    HyperlinkWidget,
+    RadioButtonsWidget,
+    DisplayValueWidget
+];
+
+