From bfd04ddbe8f0dd491dc7a0c278289f1a1f6f7c44 Mon Sep 17 00:00:00 2001
From: Are Almaas <arealmaas@gmail.com>
Date: Mon, 24 Jul 2017 12:23:18 +0200
Subject: [PATCH 1/3] chore: add differ infrastructure config

---
 .circleci/config.differ.yml           | 62 +++++++++++++++++++++++++++
 .gitignore                            |  3 ++
 charts/eddi/.helmignore               | 21 +++++++++
 charts/eddi/Chart.yaml                | 14 ++++++
 charts/eddi/requirements.yaml         |  4 ++
 charts/eddi/templates/deployment.yaml | 36 ++++++++++++++++
 charts/eddi/values.production.yaml    | 22 ++++++++++
 charts/eddi/values.yaml               | 33 ++++++++++++++
 tools/ensure-gcloud-installed.sh      | 15 +++++++
 tools/ensure-helm-installed.sh        | 10 +++++
 10 files changed, 220 insertions(+)
 create mode 100644 .circleci/config.differ.yml
 create mode 100644 charts/eddi/.helmignore
 create mode 100755 charts/eddi/Chart.yaml
 create mode 100644 charts/eddi/requirements.yaml
 create mode 100644 charts/eddi/templates/deployment.yaml
 create mode 100644 charts/eddi/values.production.yaml
 create mode 100644 charts/eddi/values.yaml
 create mode 100755 tools/ensure-gcloud-installed.sh
 create mode 100755 tools/ensure-helm-installed.sh

diff --git a/.circleci/config.differ.yml b/.circleci/config.differ.yml
new file mode 100644
index 000000000..d2bd61d51
--- /dev/null
+++ b/.circleci/config.differ.yml
@@ -0,0 +1,62 @@
+version: 2
+branches:
+  ignore:
+    - gh-pages
+jobs:
+  build:
+    docker:
+      - image: labsai/ci-build
+      - environment:
+          ACCT_AUTH: ${ACCT_AUTH}
+          APP_NAME: differ-bot-eddi
+          DOCKER_IMAGE: eu.gcr.io/differ-140008/etf-service-eddi
+          PROJECT_NAME: differ-140008
+          CLUSTER_NAME: differ-dev
+          CLOUDSDK_COMPUTE_ZONE: europe-west1-d
+    working_directory: ~/eddi
+    steps:
+      - checkout
+      - setup_remote_docker
+
+      - restore_cache:
+          key: eddi
+          paths:
+            - /root/.m2
+
+      - run: ./tools/ensure-gcloud-installed.sh
+
+      - run: ./tools/ensure-helm-installed.sh
+
+      - run: mvn clean package
+
+      - run: mkdir -p $CIRCLE_TEST_REPORTS/junit/
+      - run: find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+
+      - save_cache:
+          key: eddi
+          paths:
+            - /root/.m2
+
+      - run:
+          name: Start container and verify it's working
+          command: |
+            set -x
+            chmod +x integration-tests.sh
+            ./integration-tests.sh
+
+      - deploy:
+          name: Build and push Docker image
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+
+            # todo: get version dynamically?
+            export version=4.0.1
+
+            sudo /opt/google-cloud-sdk/bin/gcloud docker build -t $DOCKER_IMAGE:$version-$CIRCLE_BUILD_NUM .
+            sudo /opt/google-cloud-sdk/bin/gcloud docker build -t $DOCKER_IMAGE:latest .
+            
+            sudo /opt/google-cloud-sdk/bin/gcloud docker push $DOCKER_IMAGE:$version-$CIRCLE_BUILD_NUM
+            sudo /opt/google-cloud-sdk/bin/gcloud docker push $DOCKER_IMAGE:latest
+
+            sudo helm upgrade $APP_NAME charts/$APP_NAME --set image.tag=$version-$IMAGE_TAG --install
+            fi
diff --git a/.gitignore b/.gitignore
index af2b05f06..1a5386fe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 # ignore intellij files
 .idea/
 *.iml
+
+charts/eddi/charts
+charts/eddi/requirements.lock
\ No newline at end of file
diff --git a/charts/eddi/.helmignore b/charts/eddi/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/charts/eddi/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/eddi/Chart.yaml b/charts/eddi/Chart.yaml
new file mode 100755
index 000000000..3ca2e43ba
--- /dev/null
+++ b/charts/eddi/Chart.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+description: A Helm chart for the EDDI bot service
+name: eddi
+version: 1.1.2
+tier: api
+engine: gotpl
+keywords:
+- microservice
+- java
+- bot
+- nosql
+maintainers:
+- email: hello@edtechfoundry.com
+  name: Edtech Foundry
diff --git a/charts/eddi/requirements.yaml b/charts/eddi/requirements.yaml
new file mode 100644
index 000000000..be760fdcc
--- /dev/null
+++ b/charts/eddi/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: mongodb
+    version: 4.0.0
+    repository: https://differ-charts.storage.googleapis.com
diff --git a/charts/eddi/templates/deployment.yaml b/charts/eddi/templates/deployment.yaml
new file mode 100644
index 000000000..c6a6bba05
--- /dev/null
+++ b/charts/eddi/templates/deployment.yaml
@@ -0,0 +1,36 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: {{ .Values.appName }}
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: {{ .Values.appName }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    tier: api
+spec:
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.appName }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        tier: api
+    spec:
+      containers:
+      - name: {{ .Chart.Name }}
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        ports:
+        - containerPort: {{ .Values.containers.internalPort }}
+        env:
+{{ toYaml .Values.env | indent 12 }}
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: {{ .Values.containers.internalPort }}
+          initialDelaySeconds: 50
+          timeoutSeconds: 5
+        resources:
+{{ toYaml .Values.resources | indent 12 }}
diff --git a/charts/eddi/values.production.yaml b/charts/eddi/values.production.yaml
new file mode 100644
index 000000000..3024cbb83
--- /dev/null
+++ b/charts/eddi/values.production.yaml
@@ -0,0 +1,22 @@
+namespace: default
+env:
+  - name: GET_HOSTS_FROM
+    value: dns
+  - name: GCLOUD_PROJECT
+    value: 'differ-140008'
+  - name: MONGODB_HOST
+    value: 'mongodb://eddi-storage-0.eddi-storage'
+resources:
+  limits:
+    cpu: 200m
+    # nodejs heap limit
+    memory: 1536Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+mongodb:
+  diskSize: 20G
+  resources:
+    requests:
+      memory: 256Mi
+      cpu: 100m
diff --git a/charts/eddi/values.yaml b/charts/eddi/values.yaml
new file mode 100644
index 000000000..20bf5145f
--- /dev/null
+++ b/charts/eddi/values.yaml
@@ -0,0 +1,33 @@
+appName: eddi
+namespace: default
+replicaCount: 1
+image:
+  repository: eu.gcr.io/differ-140008/etf-service-bot-eddi
+  tag: latest
+  pullPolicy: IfNotPresent
+containers:
+  internalPort: 7070
+resources:
+  limits:
+    cpu: 100m
+    # nodejs heap limit
+    memory: 1536Mi
+  requests:
+    cpu: 20m
+    memory: 64Mi
+env:
+  - name: GET_HOSTS_FROM
+    value: dns
+  - name: GCLOUD_PROJECT
+    value: 'differ-140008'
+  - name: MONGODB_HOST
+    value: 'mongodb://eddi-storage-0.eddi-storage'
+mongodb:
+  appName: eddi-storage
+  namespace: default
+  mongodbVersion: 3.4
+  imagePullPolicy: IfNotPresent
+  resources:
+    requests:
+      memory: 128Mi
+      cpu: 20m
diff --git a/tools/ensure-gcloud-installed.sh b/tools/ensure-gcloud-installed.sh
new file mode 100755
index 000000000..e0f4568d1
--- /dev/null
+++ b/tools/ensure-gcloud-installed.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+set -x
+
+# Install and configure gcloud
+sudo /opt/google-cloud-sdk/bin/gcloud --quiet components update --version 120.0.0
+sudo /opt/google-cloud-sdk/bin/gcloud --quiet components update --version 120.0.0 kubectl
+echo $ACCT_AUTH | base64 --decode -i > ${HOME}/account-auth.json
+sudo /opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file ${HOME}/account-auth.json
+sudo /opt/google-cloud-sdk/bin/gcloud config set project $PROJECT_NAME
+sudo /opt/google-cloud-sdk/bin/gcloud --quiet config set container/cluster $CLUSTER_NAME
+
+# Reading the zone from the env var is not working so we set it here
+sudo /opt/google-cloud-sdk/bin/gcloud config set compute/zone ${CLOUDSDK_COMPUTE_ZONE}
+sudo /opt/google-cloud-sdk/bin/gcloud --quiet container clusters get-credentials $CLUSTER_NAME
diff --git a/tools/ensure-helm-installed.sh b/tools/ensure-helm-installed.sh
new file mode 100755
index 000000000..8217ee0f5
--- /dev/null
+++ b/tools/ensure-helm-installed.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+set -x
+
+curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get > get_helm.sh
+chmod 700 get_helm.sh
+./get_helm.sh
+sudo helm init
+sudo helm repo add differ-charts https://differ-charts.storage.googleapis.com
+sudo helm repo update

From a0a275a828e45a5568c5f2c89d95b66bf8607f4a Mon Sep 17 00:00:00 2001
From: Are Almaas <arealmaas@gmail.com>
Date: Mon, 24 Jul 2017 12:32:51 +0200
Subject: [PATCH 2/3] rm blankspace

---
 .circleci/config.differ.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.differ.yml b/.circleci/config.differ.yml
index d2bd61d51..289257972 100644
--- a/.circleci/config.differ.yml
+++ b/.circleci/config.differ.yml
@@ -54,7 +54,7 @@ jobs:
 
             sudo /opt/google-cloud-sdk/bin/gcloud docker build -t $DOCKER_IMAGE:$version-$CIRCLE_BUILD_NUM .
             sudo /opt/google-cloud-sdk/bin/gcloud docker build -t $DOCKER_IMAGE:latest .
-            
+
             sudo /opt/google-cloud-sdk/bin/gcloud docker push $DOCKER_IMAGE:$version-$CIRCLE_BUILD_NUM
             sudo /opt/google-cloud-sdk/bin/gcloud docker push $DOCKER_IMAGE:latest
 

From 2982883e724612d97d4420c913462cd7da052f70 Mon Sep 17 00:00:00 2001
From: Are Almaas <arealmaas@gmail.com>
Date: Mon, 24 Jul 2017 12:34:47 +0200
Subject: [PATCH 3/3] Revert "Merge remote-tracking branch 'labsai/master' into
 chore--add-differ-infrastrcture-config"

This reverts commit bb5f6b9cd1842c5bfcd1429ce1c8b52aabc2ad3b, reversing
changes made to a0a275a828e45a5568c5f2c89d95b66bf8607f4a.
---
 .circleci/config.yml                          |  13 +-
 .../development/systemRuntime.properties      |   2 +-
 apiserver/pom.xml                             |   5 -
 .../src/main/java/ai/labs/api/ApiServer.java  |   2 -
 apiserver/src/main/resources/css/chat.css     |  24 --
 apiserver/src/main/resources/js/chat.js       | 253 +++++++++---------
 .../rest/bots/model/BotConfiguration.java     |  17 +-
 .../rest/bots/model/ChannelConnector.java     |  17 ++
 .../output/model/OutputConfiguration.java     |  17 +-
 .../output/model/OutputConfigurationSet.java  |   2 -
 .../packages/model/PackageConfiguration.java  |   8 +-
 .../impl/ConversationCallbackTask.java        |   3 +-
 .../ai/labs/lifecycle/ILifecycleTask.java     |  21 +-
 .../labs/lifecycle/AbstractLifecycleTask.java |  25 ++
 .../ai/labs/memory/IConversationMemory.java   |  12 +-
 .../src/main/java/ai/labs/memory/IData.java   |   8 +-
 .../java/ai/labs/memory/IDataFactory.java     |  12 -
 .../SimpleConversationMemorySnapshot.java     |   6 +-
 .../ai/labs/memory/ConversationMemory.java    |  31 ++-
 .../memory/ConversationMemoryUtilities.java   |   9 +-
 .../java/ai/labs/memory/ConversationStep.java |  47 ++--
 .../src/main/java/ai/labs/memory/Data.java    |  65 +++--
 .../main/java/ai/labs/memory/DataFactory.java |  18 --
 .../bootstrap/ConversationMemoryModule.java   |   5 +-
 .../ai/labs/memory/ConversationStepTest.java  |  32 +--
 .../main/java/ai/labs/core/CoreRuntime.java   |  10 +
 .../ai/labs/core/behavior/BehaviorGroup.java  |  25 +-
 .../ai/labs/core/behavior/BehaviorRule.java   |  76 +++---
 .../core/behavior/BehaviorRuleSetParser.java  |  10 +
 .../behavior/BehaviorRulesEvaluationTask.java |  25 +-
 .../core/behavior/BehaviorRulesEvaluator.java |  23 +-
 ...zation.java => BehaviorSerialization.java} |  52 +++-
 .../ai/labs/core/behavior/BehaviorSet.java    |  22 +-
 .../labs/core/behavior/BehaviorSetResult.java |  54 +++-
 ...ation.java => IBehaviorSerialization.java} |   6 +-
 .../core/behavior/extensions/Connector.java   |  41 ++-
 .../core/behavior/extensions/Dependency.java  |  21 +-
 .../core/behavior/extensions/IExtension.java  |  14 +-
 .../behavior/extensions/InputMatcher.java     |  24 +-
 .../core/behavior/extensions/Negation.java    |  14 +-
 .../core/behavior/extensions/Occurrence.java  |  39 ++-
 .../behavior/extensions/OutputReference.java  | 147 ++++++++++
 .../behavior/extensions/PropertyMatcher.java  |  88 ++++++
 .../core/behavior/extensions/ResultSize.java  |  42 ++-
 .../BehaviorRuleExtensionRegistry.java        |   8 +-
 .../ExtensionDescriptorBuilder.java           |  11 +-
 .../ai/labs/core/bootstrap/CoreModule.java    |  10 +-
 .../core/normalizing/NormalizeInputTask.java  |   9 +-
 .../ai/labs/core}/output/IOutputFilter.java   |   2 +-
 .../ai/labs/core}/output/ISimpleOutput.java   |   4 +-
 .../ai/labs/core/output}/OutputEntry.java     |  13 +-
 .../ai/labs/core/output}/OutputFilter.java    |   3 +-
 .../ai/labs/core/output}/SimpleOutput.java    |  24 +-
 .../labs/core/output}/SimpleOutputTask.java   |  85 ++----
 .../core/rest/internal/RestBotEngine.java     |  15 +-
 .../DeseralizeJsonBehaviorRulesTest.java      |   4 +-
 .../SerializeJsonBehaviorRulesTest.java       |  16 +-
 .../core/output/OutputSerializationTest.java  |  47 ++++
 .../labs/core/output}/SimpleOutputTest.java   |  14 +-
 .../endpoint/FacebookEndpoint.java            |   7 +-
 outputgeneration-definition/pom.xml           |  26 --
 .../main/java/ai/labs/output/IQuickReply.java |  10 -
 outputgeneration-impl/pom.xml                 |  41 ---
 .../bootstrap/OutputGenerationModule.java     |  18 --
 .../java/ai/labs/output/impl/QuickReply.java  |  17 --
 .../output/impl/OutputSerializationTest.java  |  54 ----
 pom.xml                                       |   2 -
 .../java/ai/labs/runtime/BaseRuntime.java     |  17 +-
 .../ai/labs/parser/rest/model/Solution.java   |   6 +-
 semanticparser-impl/pom.xml                   |   5 -
 .../ai/labs/parser/DictionaryUtilities.java   |  57 ----
 .../java/ai/labs/parser/IInputParser.java     |   3 -
 .../java/ai/labs/parser/InputParserTask.java  |  77 +++---
 .../java/ai/labs/parser/TestDictionary.java   |  21 +-
 .../ai/labs/parser/internal/InputHolder.java  |   8 +-
 .../ai/labs/parser/internal/InputParser.java  | 147 +++++-----
 .../internal/matches/IterationCounter.java    |   4 +-
 .../parser/internal/matches/MatchMatrix.java  |  12 +-
 .../internal/matches/MatchingResult.java      |  17 +-
 .../parser/internal/matches/Permutation.java  |   8 +-
 .../parser/internal/matches/Suggestion.java   |   6 +-
 .../ai/labs/parser/model/DictionaryEntry.java |  20 +-
 .../main/java/ai/labs/parser/model/Word.java  |   2 +-
 .../parser/rest/impl/RestSemanticParser.java  |   8 +-
 .../java/ai/labs/parser/InputParserTest.java  |  54 ++--
 .../parser/TemporaryDictionaryParserTest.java |  86 ------
 .../phrases/PhraseExpressionTest.java         |  78 ++++++
 .../internal/phrases/PhraseRegexTest.java     |  38 +++
 88 files changed, 1368 insertions(+), 1133 deletions(-)
 create mode 100644 configurationrepository-definition/src/main/java/ai/labs/resources/rest/bots/model/ChannelConnector.java
 create mode 100644 conversationlifecycle-impl/src/main/java/ai/labs/lifecycle/AbstractLifecycleTask.java
 delete mode 100644 conversationmemory-definition/src/main/java/ai/labs/memory/IDataFactory.java
 delete mode 100644 conversationmemory-impl/src/main/java/ai/labs/memory/DataFactory.java
 create mode 100644 coreserver/src/main/java/ai/labs/core/behavior/BehaviorRuleSetParser.java
 rename coreserver/src/main/java/ai/labs/core/behavior/{BehaviorDeserialization.java => BehaviorSerialization.java} (62%)
 rename coreserver/src/main/java/ai/labs/core/behavior/{IBehaviorDeserialization.java => IBehaviorSerialization.java} (59%)
 create mode 100644 coreserver/src/main/java/ai/labs/core/behavior/extensions/OutputReference.java
 create mode 100644 coreserver/src/main/java/ai/labs/core/behavior/extensions/PropertyMatcher.java
 rename {outputgeneration-definition/src/main/java/ai/labs => coreserver/src/main/java/ai/labs/core}/output/IOutputFilter.java (78%)
 rename {outputgeneration-definition/src/main/java/ai/labs => coreserver/src/main/java/ai/labs/core}/output/ISimpleOutput.java (76%)
 rename {outputgeneration-definition/src/main/java/ai/labs/output/model => coreserver/src/main/java/ai/labs/core/output}/OutputEntry.java (60%)
 rename {outputgeneration-impl/src/main/java/ai/labs/output/impl => coreserver/src/main/java/ai/labs/core/output}/OutputFilter.java (76%)
 rename {outputgeneration-impl/src/main/java/ai/labs/output/impl => coreserver/src/main/java/ai/labs/core/output}/SimpleOutput.java (92%)
 rename {outputgeneration-impl/src/main/java/ai/labs/output/impl => coreserver/src/main/java/ai/labs/core/output}/SimpleOutputTask.java (55%)
 create mode 100644 coreserver/src/test/java/ai/labs/core/output/OutputSerializationTest.java
 rename {outputgeneration-impl/src/test/java/ai/labs/output/impl => coreserver/src/test/java/ai/labs/core/output}/SimpleOutputTest.java (89%)
 delete mode 100644 outputgeneration-definition/pom.xml
 delete mode 100644 outputgeneration-definition/src/main/java/ai/labs/output/IQuickReply.java
 delete mode 100644 outputgeneration-impl/pom.xml
 delete mode 100644 outputgeneration-impl/src/main/java/ai/labs/output/bootstrap/OutputGenerationModule.java
 delete mode 100644 outputgeneration-impl/src/main/java/ai/labs/output/impl/QuickReply.java
 delete mode 100644 outputgeneration-impl/src/test/java/ai/labs/output/impl/OutputSerializationTest.java
 delete mode 100644 semanticparser-impl/src/main/java/ai/labs/parser/DictionaryUtilities.java
 rename semanticparser-impl/src/{test => main}/java/ai/labs/parser/TestDictionary.java (67%)
 delete mode 100644 semanticparser-impl/src/test/java/ai/labs/parser/TemporaryDictionaryParserTest.java
 create mode 100644 semanticparser-impl/src/test/java/ai/labs/parser/internal/phrases/PhraseExpressionTest.java
 create mode 100644 semanticparser-impl/src/test/java/ai/labs/parser/internal/phrases/PhraseRegexTest.java

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 464b9c2a8..a01cd515f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,18 +39,9 @@ jobs:
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
             docker login -u $DOCKER_USER -p $DOCKER_PASS
 
-            docker build -t labsai/eddi:4.1.0-b$CIRCLE_BUILD_NUM .
-            docker push labsai/eddi:4.1.0-b$CIRCLE_BUILD_NUM
+            docker build -t labsai/eddi:4.0.1-b$CIRCLE_BUILD_NUM .
+            docker push labsai/eddi:4.0.1-b$CIRCLE_BUILD_NUM
 
             docker build -t labsai/eddi:latest .
             docker push labsai/eddi:latest
-
-            # docker build -t labsai/eddi:4.1.0 .
-            # docker push labsai/eddi:4.1.0
-
-            # docker build -t labsai/eddi:4.1 .
-            # docker push labsai/eddi:4.1
-
-            # docker build -t labsai/eddi:4 .
-            # docker push labsai/eddi:4
             fi
diff --git a/apiserver/config/development/systemRuntime.properties b/apiserver/config/development/systemRuntime.properties
index 823e2d3c3..273b7712c 100644
--- a/apiserver/config/development/systemRuntime.properties
+++ b/apiserver/config/development/systemRuntime.properties
@@ -1,5 +1,5 @@
 systemRuntime.projectName=eddi
-systemRuntime.projectVersion=4.1.0
+systemRuntime.projectVersion=4.0.1
 systemRuntime.configDir=config/development
 systemRuntime.resourceDir=resources
 systemRuntime.logDir=logs
diff --git a/apiserver/pom.xml b/apiserver/pom.xml
index 7b7220efc..3ce702048 100644
--- a/apiserver/pom.xml
+++ b/apiserver/pom.xml
@@ -175,11 +175,6 @@
             <artifactId>semanticparser-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>ai.labs</groupId>
-            <artifactId>outputgeneration-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>ai.labs</groupId>
             <artifactId>caching-impl-infinispan</artifactId>
diff --git a/apiserver/src/main/java/ai/labs/api/ApiServer.java b/apiserver/src/main/java/ai/labs/api/ApiServer.java
index eb4a62598..8c5306ed1 100644
--- a/apiserver/src/main/java/ai/labs/api/ApiServer.java
+++ b/apiserver/src/main/java/ai/labs/api/ApiServer.java
@@ -8,7 +8,6 @@
 import ai.labs.facebookmessenger.bootstrap.FacebookMessengerModule;
 import ai.labs.httpclient.guice.HttpClientModule;
 import ai.labs.memory.bootstrap.ConversationMemoryModule;
-import ai.labs.output.bootstrap.OutputGenerationModule;
 import ai.labs.parser.bootstrap.SemanticParserModule;
 import ai.labs.permission.bootstrap.PermissionModule;
 import ai.labs.persistence.bootstrap.PersistenceModule;
@@ -61,7 +60,6 @@ public static void main(String[] args) throws Exception {
                 new UserModule(),
                 new CachingModule(new FileInputStream(configDir + "infinispan.xml")),
                 new SemanticParserModule(),
-                new OutputGenerationModule(),
                 new AutomatedtestingModule(),
                 new StaticResourcesModule(),
                 new HttpClientModule(),
diff --git a/apiserver/src/main/resources/css/chat.css b/apiserver/src/main/resources/css/chat.css
index fd305a354..2a7cf22d5 100644
--- a/apiserver/src/main/resources/css/chat.css
+++ b/apiserver/src/main/resources/css/chat.css
@@ -65,30 +65,6 @@ body {
     opacity: 0;
 }
 
-.messages .quick_reply {
-    position: relative;
-    clear: both;
-    overflow: hidden;
-    transition: all 0.5s linear;
-    opacity: 0;
-    background-color: #ffe6cb;
-    color: #c48843;
-    border: 2px dashed #c48843;
-    padding: 15px 32px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    font-size: 16px;
-    border-radius: 6px;
-    cursor: pointer;
-    box-shadow: 2px 2px gray;
-    margin: 5px;
-}
-
-.messages .quick_reply.appeared {
-    opacity: 1;
-}
-
 .typing {
     background-color: #8c8c8c;
     font-weight: bolder;
diff --git a/apiserver/src/main/resources/js/chat.js b/apiserver/src/main/resources/js/chat.js
index 92605da93..b16312d95 100644
--- a/apiserver/src/main/resources/js/chat.js
+++ b/apiserver/src/main/resources/js/chat.js
@@ -1,99 +1,58 @@
-const eddi = {};
+var eddi = {};
 
-class Message {
-    constructor(text, message_side) {
-        this.text = text;
-        this.message_side = message_side;
-    }
-
-    get draw() {
+var Message;
+Message = function (arg) {
+    this.text = arg.text, this.message_side = arg.message_side;
+    this.draw = function (_this) {
         return function () {
-            const $message = $($('.message_template').clone().html());
-            $message.addClass(this.message_side).find('.text').html(this.text);
+            var $message;
+            $message = $($('.message_template').clone().html());
+            $message.addClass(_this.message_side).find('.text').html(_this.text);
             $('.messages').append($message);
             return setTimeout(function () {
                 return $message.addClass('appeared');
             }, 0);
         };
-    }
-}
-
-class QuickReply {
-    constructor(text, message_side) {
-        this.text = text;
-        this.message_side = message_side;
-    }
-
-    get draw() {
-        return function () {
-            const _this = this;
-            const $quickReply = $('<button/>', {
-                text: this.text,
-                click: function () {
-                    eddi.submitUserMessage(_this.text);
-                    eddi.displayMessage(_this.text, 'right');
-                    $('.quick_reply').remove();
-                }
-            });
-            $quickReply.addClass(this.message_side);
-            $quickReply.addClass('quick_reply');
-            $('.messages').append($quickReply);
-            return setTimeout(function () {
-                return $quickReply.addClass('appeared');
-            }, 0);
-        };
-    }
-}
-
+    }(this);
+    return this;
+};
 $(function () {
-    let message_side = 'right';
-
-    function getMessageText() {
-        const $message_input = $('.message_input');
+    var getMessageText, message_side, displayMessage;
+    message_side = 'right';
+    getMessageText = function () {
+        var $message_input;
+        $message_input = $('.message_input');
         return $message_input.val();
-    }
-
-    eddi.displayMessage = function (text, side) {
-        let $messages, message;
+    };
+    displayMessage = function (text, side) {
+        var $messages, message;
         if (text.trim() === '') {
             return;
         }
         $('.message_input').val('');
         $messages = $('.messages');
         message_side = side ? 'right' : 'left';
-        message = new Message(text, side);
+        message = new Message({
+            text: text,
+            message_side: side
+        });
         message.draw();
         return $messages.animate({scrollTop: $messages.prop('scrollHeight')}, 300);
     };
-
-    function displayQuickReplies(quickReplies) {
-        let $messages, quickReply;
-        if (quickReplies.length === 0) {
-            return;
-        }
-
-        $messages = $('.messages');
-        for (let i = 0; i < quickReplies.length; i++) {
-            quickReply = new QuickReply(quickReplies[i].value, 'left');
-            quickReply.draw();
-        }
-        return $messages.animate({scrollTop: $messages.prop('scrollHeight')}, 300);
-    }
-
-    $('.send_message').click(function () {
-        const userMessage = getMessageText();
-        eddi.submitUserMessage(userMessage);
-        return eddi.displayMessage(userMessage, 'right');
+    $('.send_message').click(function (e) {
+        var userMessage = getMessageText();
+        submitUserMessage(userMessage);
+        return displayMessage(userMessage, 'right');
     });
     $('.message_input').keyup(function (e) {
         if (e.which === 13) {
-            const userMessage = getMessageText();
-            eddi.submitUserMessage(userMessage);
-            return eddi.displayMessage(userMessage, 'right');
+            var userMessage = getMessageText();
+            submitUserMessage(userMessage);
+            return displayMessage(userMessage, 'right');
         }
     });
 
-    eddi.submitUserMessage = function (userMessage) {
+    var submitUserMessage = function (userMessage) {
         $.ajax({
             type: "POST",
             url: "/bots/" + eddi.environment + "/" + eddi.botId + "/" + eddi.conversationId,
@@ -105,80 +64,117 @@ $(function () {
         });
     };
 
-    const loadConversationLog = function () {
+    var loadConversationLog = function () {
         $.get("/bots/" + eddi.environment + "/" + eddi.botId + "/" + eddi.conversationId).done(function (data) {
             refreshConversationLog(data);
         });
     };
 
-    const refreshConversationLog = function (conversationMemory) {
-        const conversationState = conversationMemory.conversationState;
+    var refreshConversationLog = function (conversationMemory) {
+        var conversationState = conversationMemory.conversationState;
 
-        if (conversationState === 'ERROR') {
+        if (conversationState == 'ERROR') {
             log('ERROR', "An Error has occurred. Please contact the administrator!");
             return;
         }
 
-        if (conversationState === 'IN_PROGRESS') {
+        if (conversationState == 'ENDED') {
+            $("#ended_dialog").dialog({
+                modal: true,
+                buttons: [
+                    {
+                        text: "New Conversation!",
+                        click: function () {
+                            $(this).dialog("close");
+                            startNewConversation();
+                        }
+                    }
+                ],
+                position: {my: "top"},
+                width: 300
+            });
+            $("#ended_dialog").dialog("option", "closeOnEscape", false);
+            $('#status_indicator').css('visibility', 'hidden');
+            $('#user_input_button_submit').addClass('ui-disabled');
+            $('#redo').hide();
+            $('#undo').hide();
+        }
+
+        if (conversationState == 'IN_PROGRESS') {
             setTimeout(loadConversationLog, 1000);
             return;
         }
 
-        let ioList = [];
-        for (let i = 0; i < conversationMemory.conversationSteps.length; i++) {
-            let step = conversationMemory.conversationSteps[i];
-
-            let input = null;
-            let output = null;
-            let media = null;
-            let action = null;
-            let quickReplies = [];
-            for (let x = 0; x < step.data.length; x++) {
-                let obj = step.data[x];
-                if (obj.key.indexOf('input') === 0) {
+        var ioList = [];
+        for (var i = 0; i < conversationMemory.conversationSteps.length; i++) {
+            var step = conversationMemory.conversationSteps[i];
+
+            var input = null;
+            var output = null;
+            var media = null;
+            for (var x = 0; x < step.data.length; x++) {
+                var obj = step.data[x];
+                if (obj.key.indexOf('input') == 0) {
                     input = obj.value;
-                } else if (obj.key.indexOf('media') === 0) {
-                    media = obj.value;
-                } else if (obj.key.indexOf('actions') === 0) {
-                    action = obj.value;
-                } else if (obj.key.indexOf('output:quickreply') === 0) {
-                    pushArray(quickReplies, obj.value);
-                } else if (obj.key.indexOf('output') === 0) {
+                } else if (obj.key.indexOf('output') == 0) {
                     output = obj.value;
+                } else if (obj.key.indexOf('media') == 0) {
+                    media = obj.value;
+                } else if (obj.key.indexOf('actions') == 0) {
                 }
             }
 
-            ioList.push({input: input, output: output, media: media, quickReplies: quickReplies});
+            ioList.push({input: input, output: output, media: media});
         }
 
         if (ioList.length > 0) {
-            let latestInteraction = ioList[ioList.length - 1];
+            var latestInteraction = ioList[ioList.length - 1];
             if (latestInteraction === 'undefined') {
                 latestInteraction = {};
             }
 
-            if (latestInteraction.output === null) {
+            //apply media/images
+            //var mediaURI = latestInteraction.media;
+            /*if (typeof mediaURI !== 'undefined' && mediaURI.indexOf('image') == 0) {
+             var mediaURL = baseURL + '/binary/default/mobile/images' + mediaURI.substring(mediaURI.lastIndexOf('/'));
+             var img = $('<img id="' + mediaURI.substring(mediaURI.lastIndexOf('/' + 1, mediaURI.lastIndexOf('.'))) + '">');
+             img.attr('src', mediaURL);
+             img.attr('class', 'media_img');
+             $('#desktop').html(img);
+             } else {
+             $('#desktop').html('<div style="text-align: center;width: 100%; height: 100%;">Nothing to show at the moment..</div>');
+             }*/
+
+            if (latestInteraction.output == null) {
                 latestInteraction.output = '';
             }
 
-            eddi.displayMessage(latestInteraction.output, 'left');
-            displayQuickReplies(latestInteraction.quickReplies);
+            /*var mediaURIsString = latestInteraction.media;
+             if (mediaURIsString != null) {
+             var mediaURIs = mediaURIsString.split(',');
+             for (var n = 0; n < mediaURIs.length; n++) {
+             var mediaURI = mediaURIs[n];
+             if (mediaURI.indexOf('pdf') == 0) {
+             var fileName = mediaURI.substring(mediaURI.lastIndexOf('/') + 1);
+             var mediaURL = baseURL + '/binary/default/desktop/binary/' + fileName;
+             latestInteraction.output += '<br /><a target="_blank" href="' + mediaURL + '">' + fileName + '</a>'
+             }
+             }
+             }*/
+
+            displayMessage(latestInteraction.output, 'left');
 
             $('.message_input').focus();
         }
     };
 
-    const pushArray = function (arr, arr2) {
-        arr.push.apply(arr, arr2);
-    };
-
-    const deployBot = function (environment, botId, botVersion) {
+    var deployBot = function (environment, botId, botVersion) {
         $.post("/administration/" + environment + "/deploy/" + botId + "?version=" + botVersion).done(function () {
             checkBotDeploymentStatus();
         });
     };
 
-    const checkBotDeploymentStatus = function () {
+    var checkBotDeploymentStatus = function () {
         $.get("/administration/" + eddi.environment + "/deploymentstatus/" + eddi.botId + "?version=" + eddi.botVersion).done(function (data) {
             if (data === 'IN_PROGRESS') {
                 setTimeout(checkBotDeploymentStatus, 1000);
@@ -190,16 +186,16 @@ $(function () {
         });
     };
 
-    const createConversation = function (environment, botId) {
+    var createConversation = function (environment, botId) {
         $.post("/bots/" + environment + "/" + botId).done(function (data, status, xhr) {
-            const conversationUriArray = xhr.getResponseHeader('Location').split("/");
+            var conversationUriArray = xhr.getResponseHeader('Location').split("/");
             eddi.conversationId = conversationUriArray[conversationUriArray.length - 1];
             proceedConversation();
         });
     };
 
-    const checkConversationStatus = function (environment, botId, conversationId) {
-        $.get("/bots/" + environment + "/" + botId + "/" + conversationId).always(function (data, status) {
+    var checkConversationStatus = function (environment, botId, conversationId) {
+        $.get("/bots/" + environment + "/" + botId + "/" + conversationId).always(function (data, status, xhr) {
             if (status === "error") {
                 alert("Checking conversation has yield into an error.. ");
             } else if (status === "success") {
@@ -213,16 +209,16 @@ $(function () {
         });
     };
 
-    const getQueryParts = function (href) {
-        const query = $.url.parse(href);
-        const path = query.path;
+    var getQueryParts = function (href) {
+        var query = $.url.parse(href);
+        var path = query.path;
 
-        const parts = path.split("/");
+        var parts = path.split("/");
 
-        let environment = null;
-        let botId = null;
-        let conversationId = null;
-        let botVersion = null;
+        var environment = null;
+        var botId = null;
+        var conversationId = null;
+        var botVersion = null;
 
         environment = typeof parts[2] !== 'undefined' ? decodeURIComponent(parts[2]) : environment;
         botId = typeof parts[3] !== 'undefined' ? decodeURIComponent(parts[3]) : botId;
@@ -234,7 +230,7 @@ $(function () {
         return {conversationId: conversationId, environment: environment, botId: botId, botVersion: botVersion};
     };
 
-    const proceedConversation = function () {
+    var proceedConversation = function () {
         if (!eddi.conversationId) {
             createConversation(eddi.environment, eddi.botId);
         } else {
@@ -242,14 +238,13 @@ $(function () {
         }
     };
 
-    const checkBotDeployment = function () {
+    var checkBotDeployment = function () {
         //check if bot is deployed
         $.get("/administration/" + eddi.environment + "/deploymentstatus/" + eddi.botId + "?version=" + eddi.botVersion)
             .done(function (data) {
                 if (data === 'NOT_FOUND') {
-                    if (confirm('Bot is not deployed at the moment.. Deploy latest version NOW?')) {
-                        deployBot(eddi.environment, eddi.botId, eddi.botVersion);
-                    }
+                    alert('Bot is not deployed at the moment.. Deploy NOW?');
+                    deployBot(eddi.environment, eddi.botId, eddi.botVersion);
                 }
 
                 if (data === 'ERROR') {
@@ -267,7 +262,7 @@ $(function () {
     };
 
     $(document).ready(function () {
-        const extractedParams = getQueryParts(window.location.href);
+        var extractedParams = getQueryParts(window.location.href);
         //extract environment from URL
         if (extractedParams.environment !== null) {
             eddi.environment = extractedParams.environment;
@@ -294,4 +289,12 @@ $(function () {
             });
         }
     });
+
+    /*displayMessage('Hello Philip! :)', 'left');
+     setTimeout(function () {
+     return displayMessage('Hi Sandy! How are you?', 'right');
+     }, 1000);
+     return setTimeout(function () {
+     return displayMessage('I\'m fine, thank you!', 'left');
+     }, 2000);*/
 });
\ No newline at end of file
diff --git a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/bots/model/BotConfiguration.java b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/bots/model/BotConfiguration.java
index 1ab926fbb..51b4a10d1 100644
--- a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/bots/model/BotConfiguration.java
+++ b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/bots/model/BotConfiguration.java
@@ -6,9 +6,7 @@
 
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author ginccc
@@ -17,14 +15,13 @@
 @Getter
 @Setter
 public class BotConfiguration {
-    private boolean authenticationRequired = true;
-    private List<URI> packages = new ArrayList<>();
-    private List<ChannelConnector> channels = new ArrayList<>();
+    private boolean authenticationRequired;
+    private List<URI> packages;
+    private List<ChannelConnector> channels;
 
-    @Getter
-    @Setter
-    public static class ChannelConnector {
-        private URI type;
-        private Map<String, String> config = new HashMap<>();
+    public BotConfiguration() {
+        authenticationRequired = true;
+        this.packages = new ArrayList<>();
+        this.channels = new ArrayList<>();
     }
 }
diff --git a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/bots/model/ChannelConnector.java b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/bots/model/ChannelConnector.java
new file mode 100644
index 000000000..5959780c0
--- /dev/null
+++ b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/bots/model/ChannelConnector.java
@@ -0,0 +1,17 @@
+package ai.labs.resources.rest.bots.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.net.URI;
+import java.util.Map;
+
+/**
+ * @author ginccc
+ */
+@Getter
+@Setter
+public class ChannelConnector {
+    private URI type;
+    private Map<String, String> config;
+}
diff --git a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/output/model/OutputConfiguration.java b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/output/model/OutputConfiguration.java
index 39cf1dcc3..6ff30cd3e 100644
--- a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/output/model/OutputConfiguration.java
+++ b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/output/model/OutputConfiguration.java
@@ -4,6 +4,7 @@
 import lombok.Setter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -15,21 +16,17 @@
 public class OutputConfiguration {
     private String key;
     private List<String> outputValues;
-    private List<QuickReply> quickReplies;
     private int occurrence;
 
-    public OutputConfiguration(String key, int occurrence, List<String> outputValues, List<QuickReply> quickReplies) {
+    public OutputConfiguration(String key, int occurrence, String... values) {
         this.key = key;
         this.occurrence = occurrence;
         this.outputValues = new ArrayList<>();
-        this.outputValues.addAll(outputValues);
-        this.quickReplies = new ArrayList<>();
-        this.quickReplies.addAll(quickReplies);
+        outputValues.addAll(Arrays.asList(values));
     }
 
     public OutputConfiguration() {
         this.outputValues = new ArrayList<>();
-        this.quickReplies = new ArrayList<>();
     }
 
     @Override
@@ -48,12 +45,4 @@ public int hashCode() {
         result = 31 * result + occurrence;
         return result;
     }
-
-    @Getter
-    @Setter
-    public static class QuickReply {
-        private String value;
-        private String expressions;
-
-    }
 }
diff --git a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/output/model/OutputConfigurationSet.java b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/output/model/OutputConfigurationSet.java
index 21312ad40..74baac678 100644
--- a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/output/model/OutputConfigurationSet.java
+++ b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/output/model/OutputConfigurationSet.java
@@ -1,6 +1,5 @@
 package ai.labs.resources.rest.output.model;
 
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,7 +12,6 @@
 
 @Getter
 @Setter
-@EqualsAndHashCode
 public class OutputConfigurationSet {
     private List<OutputConfiguration> outputs;
 
diff --git a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/packages/model/PackageConfiguration.java b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/packages/model/PackageConfiguration.java
index 1e382fc36..656542da0 100644
--- a/configurationrepository-definition/src/main/java/ai/labs/resources/rest/packages/model/PackageConfiguration.java
+++ b/configurationrepository-definition/src/main/java/ai/labs/resources/rest/packages/model/PackageConfiguration.java
@@ -5,8 +5,6 @@
 import lombok.Setter;
 
 import java.net.URI;
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -18,13 +16,13 @@
 @Setter
 @NoArgsConstructor
 public class PackageConfiguration {
-    private List<PackageExtension> packageExtensions = new LinkedList<>();
+    private List<PackageExtension> packageExtensions;
 
     @Getter
     @Setter
     public static class PackageExtension {
         private URI type;
-        private Map<String, Object> extensions = new HashMap<>();
-        private Map<String, Object> config = new HashMap<>();
+        private Map<String, Object> extensions;
+        private Map<String, Object> config;
     }
 }
diff --git a/conversationcallback-impl/src/main/java/ai/labs/callback/impl/ConversationCallbackTask.java b/conversationcallback-impl/src/main/java/ai/labs/callback/impl/ConversationCallbackTask.java
index b5d85fddf..3ecb849e5 100644
--- a/conversationcallback-impl/src/main/java/ai/labs/callback/impl/ConversationCallbackTask.java
+++ b/conversationcallback-impl/src/main/java/ai/labs/callback/impl/ConversationCallbackTask.java
@@ -4,6 +4,7 @@
 import ai.labs.callback.http.ConversationCallback;
 import ai.labs.callback.model.ConversationDataRequest;
 import ai.labs.callback.model.ConversationDataResponse;
+import ai.labs.lifecycle.AbstractLifecycleTask;
 import ai.labs.lifecycle.ILifecycleTask;
 import ai.labs.lifecycle.LifecycleException;
 import ai.labs.lifecycle.PackageConfigurationException;
@@ -24,7 +25,7 @@
  * Created by rpi on 08.02.2017.
  */
 @Slf4j
-public class ConversationCallbackTask implements ILifecycleTask {
+public class ConversationCallbackTask extends AbstractLifecycleTask implements ILifecycleTask {
     private static final String KEY_CALLBACK_URI = "callbackUri";
     private static final String KEY_TIMEOUT_IN_MILLIS = "timeoutInMillis";
 
diff --git a/conversationlifecycle-definition/src/main/java/ai/labs/lifecycle/ILifecycleTask.java b/conversationlifecycle-definition/src/main/java/ai/labs/lifecycle/ILifecycleTask.java
index e5a6fdd47..8561a58f8 100644
--- a/conversationlifecycle-definition/src/main/java/ai/labs/lifecycle/ILifecycleTask.java
+++ b/conversationlifecycle-definition/src/main/java/ai/labs/lifecycle/ILifecycleTask.java
@@ -2,7 +2,6 @@
 
 import ai.labs.memory.IConversationMemory;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -30,9 +29,7 @@ public interface ILifecycleTask {
      *
      * @return a List of Task IDs
      */
-    default List<String> getComponentDependencies() {
-        return Collections.emptyList();
-    }
+    List<String> getComponentDependencies();
 
     /**
      * Returns a List representing all Task which have to be executed in lifecycle
@@ -41,21 +38,13 @@ default List<String> getComponentDependencies() {
      *
      * @return a List of Task IDs
      */
-    default List<String> getOutputDependencies() {
-        return Collections.emptyList();
-    }
+    List<String> getOutputDependencies();
 
-    default void init() {
-        //to be overridden if needed
-    }
+    void init();
 
     void executeTask(IConversationMemory memory) throws LifecycleException;
 
-    default void configure(Map<String, Object> configuration) throws PackageConfigurationException {
-        //to be overridden if needed
-    }
+    void configure(Map<String, Object> configuration) throws PackageConfigurationException;
 
-    default void setExtensions(Map<String, Object> extensions) throws UnrecognizedExtensionException, IllegalExtensionConfigurationException {
-        //to be overridden if needed
-    }
+    void setExtensions(Map<String, Object> extensions) throws UnrecognizedExtensionException, IllegalExtensionConfigurationException;
 }
diff --git a/conversationlifecycle-impl/src/main/java/ai/labs/lifecycle/AbstractLifecycleTask.java b/conversationlifecycle-impl/src/main/java/ai/labs/lifecycle/AbstractLifecycleTask.java
new file mode 100644
index 000000000..1c612787f
--- /dev/null
+++ b/conversationlifecycle-impl/src/main/java/ai/labs/lifecycle/AbstractLifecycleTask.java
@@ -0,0 +1,25 @@
+package ai.labs.lifecycle;
+
+import java.util.Map;
+
+/**
+ * @author ginccc
+ */
+public abstract class AbstractLifecycleTask implements ILifecycleTask {
+
+
+    @Override
+    public void init() {
+        //TODO
+    }
+
+    @Override
+    public void configure(Map<String, Object> configuration) throws PackageConfigurationException {
+        //TODO
+    }
+
+    @Override
+    public void setExtensions(Map<String, Object> extensions) throws UnrecognizedExtensionException, IllegalExtensionConfigurationException {
+        //TODO
+    }
+}
diff --git a/conversationmemory-definition/src/main/java/ai/labs/memory/IConversationMemory.java b/conversationmemory-definition/src/main/java/ai/labs/memory/IConversationMemory.java
index 72c7ff4fc..024aa2367 100644
--- a/conversationmemory-definition/src/main/java/ai/labs/memory/IConversationMemory.java
+++ b/conversationmemory-definition/src/main/java/ai/labs/memory/IConversationMemory.java
@@ -43,9 +43,9 @@ public interface IConversationMemory extends Serializable {
 
 
     interface IConversationStepStack {
-        <T> IData<T> getLatestData(String key);
+        IData getLatestData(String key);
 
-        <T> List<List<IData<T>>> getAllData(String prefix);
+        List<List<IData>> getAllData(String prefix);
 
         int size();
 
@@ -55,9 +55,9 @@ interface IConversationStepStack {
     }
 
     interface IConversationStep extends Serializable {
-        <T> IData<T> getData(String key);
+        IData getData(String key);
 
-        <T> List<IData<T>> getAllData(String prefix);
+        List<IData> getAllData(String prefix);
 
         Set<String> getAllKeys();
 
@@ -73,7 +73,9 @@ interface IConversationStep extends Serializable {
 
         boolean isEmpty();
 
-        <T> IData<T> getLatestData(String prefix);
+        IData getLatestData();
+
+        IData getLatestData(String prefix);
     }
 
     interface IWritableConversationStep extends IConversationStep {
diff --git a/conversationmemory-definition/src/main/java/ai/labs/memory/IData.java b/conversationmemory-definition/src/main/java/ai/labs/memory/IData.java
index 16423a0ea..f7b18955b 100644
--- a/conversationmemory-definition/src/main/java/ai/labs/memory/IData.java
+++ b/conversationmemory-definition/src/main/java/ai/labs/memory/IData.java
@@ -7,12 +7,12 @@
 /**
  * @author ginccc
  */
-public interface IData<T> extends Serializable {
+public interface IData extends Serializable {
     String getKey();
 
-    List<T> getPossibleResults();
+    List getPossibleResults();
 
-    T getResult();
+    Object getResult();
 
     Date getTimestamp();
 
@@ -25,7 +25,7 @@ public interface IData<T> extends Serializable {
 
     void setPossibleResults(List possibleResults);
 
-    void setResult(T result);
+    void setResult(Object result);
 
     void setPublic(boolean isPublic);
 }
diff --git a/conversationmemory-definition/src/main/java/ai/labs/memory/IDataFactory.java b/conversationmemory-definition/src/main/java/ai/labs/memory/IDataFactory.java
deleted file mode 100644
index 55ecc3cec..000000000
--- a/conversationmemory-definition/src/main/java/ai/labs/memory/IDataFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package ai.labs.memory;
-
-import java.util.List;
-
-/**
- * @author ginccc
- */
-public interface IDataFactory {
-    <T> IData<T> createData(String key, T value);
-
-    <T> IData<T> createData(String key, T value, List<T> possibleValues);
-}
diff --git a/conversationmemory-definition/src/main/java/ai/labs/memory/model/SimpleConversationMemorySnapshot.java b/conversationmemory-definition/src/main/java/ai/labs/memory/model/SimpleConversationMemorySnapshot.java
index 8c0b2e36e..218276396 100644
--- a/conversationmemory-definition/src/main/java/ai/labs/memory/model/SimpleConversationMemorySnapshot.java
+++ b/conversationmemory-definition/src/main/java/ai/labs/memory/model/SimpleConversationMemorySnapshot.java
@@ -96,9 +96,9 @@ public void setTimestamp(Date timestamp) {
 
     public static class SimpleData {
         private String key;
-        private Object value;
+        private String value;
 
-        public SimpleData(String key, Object value) {
+        public SimpleData(String key, String value) {
             this.key = key;
             this.value = value;
         }
@@ -111,7 +111,7 @@ public void setKey(String key) {
             this.key = key;
         }
 
-        public Object getValue() {
+        public String getValue() {
             return value;
         }
 
diff --git a/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationMemory.java b/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationMemory.java
index e2467107b..9b54c87a8 100644
--- a/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationMemory.java
+++ b/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationMemory.java
@@ -2,10 +2,7 @@
 
 import ai.labs.memory.model.ConversationState;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
+import java.util.*;
 
 /**
  * @author ginccc
@@ -21,7 +18,7 @@ public class ConversationMemory implements IConversationMemory {
     private IConversationMemory.IConversationContext context;
     private ConversationState conversationState;
 
-    ConversationMemory(String id, String botId, Integer botVersion) {
+    public ConversationMemory(String id, String botId, Integer botVersion) {
         this(botId, botVersion);
         this.id = id;
     }
@@ -131,12 +128,20 @@ public Stack<IConversationStep> getRedoCache() {
     public final class ConversationStepStack implements IConversationStepStack {
         private List<IConversationStep> conversationSteps = new ArrayList<>();
 
-        ConversationStepStack(List<IConversationStep> steps) {
+        public ConversationStepStack(IConversationStep step) {
+            conversationSteps.add(step);
+        }
+
+        public ConversationStepStack(IConversationStep... steps) {
+            conversationSteps.addAll(Arrays.asList(steps));
+        }
+
+        public ConversationStepStack(List<IConversationStep> steps) {
             conversationSteps.addAll(steps);
         }
 
         @Override
-        public <T> IData<T> getLatestData(String key) {
+        public IData getLatestData(String key) {
             for (int i = conversationSteps.size() - 1; i >= 0; --i) {
                 IConversationStep step = conversationSteps.get(i);
                 if (step.getData(key) != null) {
@@ -147,12 +152,12 @@ public <T> IData<T> getLatestData(String key) {
         }
 
         @Override
-        public <T> List<List<IData<T>>> getAllData(String prefix) {
-            List<List<IData<T>>> allData = new LinkedList<>();
+        public List<List<IData>> getAllData(String prefix) {
+            List<List<IData>> allData = new LinkedList<>();
 
             for (int i = conversationSteps.size() - 1; i >= 0; i--) {
                 IConversationStep step = conversationSteps.get(i);
-                List<IData<T>> dataList = step.getAllData(prefix);
+                List<IData> dataList = step.getAllData(prefix);
                 if (!dataList.isEmpty()) {
                     allData.add(dataList);
                 }
@@ -188,15 +193,15 @@ public void add(IConversationStep step) {
     public static class ConversationContext implements IConversationContext {
         private String context;
 
-        ConversationContext() {
+        public ConversationContext() {
             this.context = "";
         }
 
-        ConversationContext(String context) {
+        public ConversationContext(String context) {
             this.context = context;
         }
 
-        ConversationContext(IConversationContext context) {
+        public ConversationContext(IConversationContext context) {
             this.context = context.getContext();
         }
 
diff --git a/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationMemoryUtilities.java b/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationMemoryUtilities.java
index f583abbfd..6ffc6a543 100644
--- a/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationMemoryUtilities.java
+++ b/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationMemoryUtilities.java
@@ -3,6 +3,7 @@
 import ai.labs.memory.model.ConversationMemorySnapshot;
 import ai.labs.memory.model.SimpleConversationMemorySnapshot;
 import ai.labs.persistence.IResourceStore;
+import ai.labs.utilities.CharacterUtilities;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -11,7 +12,7 @@
  * @author ginccc
  */
 public class ConversationMemoryUtilities {
-    public static ConversationMemorySnapshot convertConversationMemory(IConversationMemory conversationMemory) {
+    public static ConversationMemorySnapshot convertConversationMemory(IConversationMemory conversationMemory) throws IResourceStore.ResourceStoreException {
         ConversationMemorySnapshot snapshot = new ConversationMemorySnapshot();
 
         if (conversationMemory.getId() != null) {
@@ -54,7 +55,7 @@ private static ConversationMemorySnapshot.ConversationStepSnapshot iterateConver
     }
 
     private static List<IConversationMemory.IConversationStep> iterateRedoCache(List<ConversationMemorySnapshot.ConversationStepSnapshot> redoSteps) {
-        List<IConversationMemory.IConversationStep> conversationSteps = new LinkedList<>();
+        List<IConversationMemory.IConversationStep> conversationSteps = new LinkedList<IConversationMemory.IConversationStep>();
         for (ConversationMemorySnapshot.ConversationStepSnapshot redoStep : redoSteps) {
             IConversationMemory.IWritableConversationStep conversationStep = new ConversationStep(new ConversationMemory.ConversationContext());
             conversationSteps.add(conversationStep);
@@ -115,8 +116,8 @@ public static SimpleConversationMemorySnapshot convertSimpleConversationMemory(C
                 for (ConversationMemorySnapshot.ResultSnapshot resultSnapshot : packageRunSnapshot.getLifecycleTasks()) {
                     if (includeAll || resultSnapshot.isPublic()) {
                         Object result = resultSnapshot.getResult();
-                        simpleConversationStep.getData().add(
-                                new SimpleConversationMemorySnapshot.SimpleData(resultSnapshot.getKey(), result));
+                        String value = result instanceof List ? CharacterUtilities.arrayToString((List) result, ",") : result.toString();
+                        simpleConversationStep.getData().add(new SimpleConversationMemorySnapshot.SimpleData(resultSnapshot.getKey(), value));
                     } else {
                         continue;
                     }
diff --git a/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationStep.java b/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationStep.java
index dd2b6eb87..f13999a06 100644
--- a/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationStep.java
+++ b/conversationmemory-impl/src/main/java/ai/labs/memory/ConversationStep.java
@@ -6,34 +6,34 @@
  * @author ginccc
  */
 public class ConversationStep implements IConversationMemory.IWritableConversationStep {
-    private Map<IConversationMemory.IConversationContext, Map<String, IData>> store;
+    protected Map<IConversationMemory.IConversationContext, Map<String, IData>> store;
     private IConversationMemory.IConversationContext conversationContext;
-    int conversationStepNumber;
+    protected int conversationStepNumber;
 
-    ConversationStep(IConversationMemory.IConversationContext conversationContext) {
+    public ConversationStep(IConversationMemory.IConversationContext conversationContext) {
         this.conversationContext = conversationContext;
-        store = new LinkedHashMap<>();
+        store = new LinkedHashMap<IConversationMemory.IConversationContext, Map<String, IData>>();
     }
 
     @Override
-    public <T> IData<T> getData(String key) {
+    public IData getData(String key) {
         return getCurrentContext().get(key);
     }
 
     private Map<String, IData> getCurrentContext() {
         if (!store.containsKey(conversationContext)) {
-            store.put(new ConversationMemory.ConversationContext(conversationContext), new LinkedHashMap<>());
+            store.put(new ConversationMemory.ConversationContext(conversationContext), new LinkedHashMap<String, IData>());
         }
 
         return store.get(conversationContext);
     }
 
     @Override
-    public <T> List<IData<T>> getAllData(String prefix) {
-        List<IData<T>> dataList = new ArrayList<>();
+    public List<IData> getAllData(String prefix) {
+        List<IData> dataList = new ArrayList<IData>();
 
         for (String key : getCurrentContext().keySet()) {
-            IData<T> data = getData(key);
+            IData data = getData(key);
             if (data != null) {
                 if (key.startsWith(prefix))
                     dataList.add(data);
@@ -45,7 +45,8 @@ public <T> List<IData<T>> getAllData(String prefix) {
 
     @Override
     public void storeData(IData data) {
-        getCurrentContext().put(data.getKey(), data);
+        Data value = new Data(data);
+        getCurrentContext().put(data.getKey(), value);
     }
 
     @Override
@@ -56,7 +57,7 @@ public Set<String> getAllKeys() {
     @Override
     public List<IData> getAllElements(IConversationMemory.IConversationContext context) {
         Map<String, IData> contextMap = store.get(context);
-        return contextMap != null ? new ArrayList<>(contextMap.values()) : new ArrayList<>();
+        return contextMap != null ? new ArrayList<IData>(contextMap.values()) : new ArrayList<IData>();
     }
 
     @Override
@@ -75,13 +76,21 @@ public Set<IConversationMemory.IConversationContext> getAllConversationContexts(
     }
 
     @Override
-    public <T> IData<T> getLatestData(String prefix) {
+    public IData getLatestData() {
+        List<IData> elements = getAllElements(conversationContext);
+        if (elements.isEmpty())
+            return null;
+
+        return elements.get(elements.size() - 1);
+    }
+
+    @Override
+    public IData getLatestData(String prefix) {
         List<IData> elements = getAllElements(conversationContext);
         Collections.reverse(elements);
         for (IData element : elements) {
-            if (element.getKey().startsWith(prefix)) {
+            if (element.getKey().startsWith(prefix))
                 return element;
-            }
         }
 
         return null;
@@ -114,9 +123,11 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ConversationStep" +
-                "{input=" + getLatestData("input") +
-                ", output=" + getLatestData("output") +
-                '}';
+        final StringBuilder sb = new StringBuilder();
+        sb.append("ConversationStep");
+        sb.append("{input=").append(getLatestData("input"));
+        sb.append(", output=").append(getLatestData("output"));
+        sb.append('}');
+        return sb.toString();
     }
 }
diff --git a/conversationmemory-impl/src/main/java/ai/labs/memory/Data.java b/conversationmemory-impl/src/main/java/ai/labs/memory/Data.java
index 4648a409a..7044de59c 100644
--- a/conversationmemory-impl/src/main/java/ai/labs/memory/Data.java
+++ b/conversationmemory-impl/src/main/java/ai/labs/memory/Data.java
@@ -1,9 +1,6 @@
 package ai.labs.memory;
 
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
@@ -11,33 +8,31 @@
 /**
  * @author ginccc
  */
-@Getter
-@Setter
-public class Data<T> implements IData<T> {
+public class Data implements IData {
     private final String key;
     private List possibleResults;
-    private T result;
+    private Object result;
     private final Date timestamp;
     private boolean isPublic;
 
-    public Data(IData<T> data) {
+    public Data(IData data) {
         this(data.getKey(), data.getResult(), data.getPossibleResults(), data.getTimestamp(), data.isPublic());
         this.result = data.getResult();
     }
 
-    public Data(String key, T result) {
-        this(key, result, Collections.singletonList(result), new Date(System.currentTimeMillis()));
+    public Data(String key, Object result) {
+        this(key, result, Arrays.asList(result), new Date(System.currentTimeMillis()));
     }
 
-    public Data(String key, T result, List<T> possibleResults) {
+    public Data(String key, Object result, List possibleResults) {
         this(key, result, possibleResults, new Date(System.currentTimeMillis()));
     }
 
-    public Data(String key, T result, List<T> possibleResults, Date timestamp) {
+    public Data(String key, Object result, List possibleResults, Date timestamp) {
         this(key, result, possibleResults, timestamp, false);
     }
 
-    public Data(String key, T result, List<T> possibleResults, Date timestamp, boolean isPublic) {
+    public Data(String key, Object result, List possibleResults, Date timestamp, boolean isPublic) {
         this.key = key;
         this.result = result == null ? chooseRandomResult(possibleResults) : result;
         this.possibleResults = possibleResults;
@@ -45,7 +40,47 @@ public Data(String key, T result, List<T> possibleResults, Date timestamp, boole
         this.isPublic = isPublic;
     }
 
-    private T chooseRandomResult(List<T> results) {
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public void setPossibleResults(List possibleResults) {
+        this.possibleResults = possibleResults;
+    }
+
+    @Override
+    public List getPossibleResults() {
+        return possibleResults;
+    }
+
+    @Override
+    public void setResult(Object result) {
+        this.result = result;
+    }
+
+    @Override
+    public Object getResult() {
+        return result;
+    }
+
+    @Override
+    public Date getTimestamp() {
+        return timestamp;
+    }
+
+    @Override
+    public boolean isPublic() {
+        return isPublic;
+    }
+
+    @Override
+    public void setPublic(boolean isPublic) {
+        this.isPublic = isPublic;
+    }
+
+    private Object chooseRandomResult(List results) {
         if (!results.isEmpty()) {
             Random random = new Random();
             int randNumber = random.nextInt(results.size());
diff --git a/conversationmemory-impl/src/main/java/ai/labs/memory/DataFactory.java b/conversationmemory-impl/src/main/java/ai/labs/memory/DataFactory.java
deleted file mode 100644
index a9471976a..000000000
--- a/conversationmemory-impl/src/main/java/ai/labs/memory/DataFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package ai.labs.memory;
-
-import java.util.List;
-
-/**
- * @author ginccc
- */
-public class DataFactory implements IDataFactory {
-    @Override
-    public <T> IData<T> createData(String key, T value) {
-        return new Data<>(key, value);
-    }
-
-    @Override
-    public <T> IData<T> createData(String key, T value, List<T> possibleValues) {
-        return new Data<>(key, value, possibleValues);
-    }
-}
diff --git a/conversationmemory-impl/src/main/java/ai/labs/memory/bootstrap/ConversationMemoryModule.java b/conversationmemory-impl/src/main/java/ai/labs/memory/bootstrap/ConversationMemoryModule.java
index 25bd214e4..98a340c0d 100644
--- a/conversationmemory-impl/src/main/java/ai/labs/memory/bootstrap/ConversationMemoryModule.java
+++ b/conversationmemory-impl/src/main/java/ai/labs/memory/bootstrap/ConversationMemoryModule.java
@@ -1,6 +1,8 @@
 package ai.labs.memory.bootstrap;
 
-import ai.labs.memory.*;
+import ai.labs.memory.ConversationDescriptorStore;
+import ai.labs.memory.ConversationMemoryStore;
+import ai.labs.memory.IConversationMemoryStore;
 import ai.labs.memory.descriptor.IConversationDescriptorStore;
 import ai.labs.runtime.bootstrap.AbstractBaseModule;
 import com.google.inject.Scopes;
@@ -14,6 +16,5 @@ public class ConversationMemoryModule extends AbstractBaseModule {
     protected void configure() {
         bind(IConversationDescriptorStore.class).to(ConversationDescriptorStore.class).in(Scopes.SINGLETON);
         bind(IConversationMemoryStore.class).to(ConversationMemoryStore.class).in(Scopes.SINGLETON);
-        bind(IDataFactory.class).to(DataFactory.class).in(Scopes.SINGLETON);
     }
 }
diff --git a/conversationmemory-impl/src/test/java/ai/labs/memory/ConversationStepTest.java b/conversationmemory-impl/src/test/java/ai/labs/memory/ConversationStepTest.java
index b3060da99..87cf077be 100644
--- a/conversationmemory-impl/src/test/java/ai/labs/memory/ConversationStepTest.java
+++ b/conversationmemory-impl/src/test/java/ai/labs/memory/ConversationStepTest.java
@@ -28,7 +28,7 @@ public void tearDown() throws Exception {
     public void testPlain() throws Exception {
         //assert
         Assert.assertNull(conversationStep.getData("whatever"));
-        final List<IData<Void>> allData = conversationStep.getAllData("void");
+        final List<IData> allData = conversationStep.getAllData("asdf");
         Assert.assertNotNull(allData);
         Assert.assertTrue(allData.size() == 0);
         Assert.assertNotNull(conversationStep.getAllElements(conversationStep.getCurrentConversationContext()));
@@ -42,24 +42,24 @@ public void testPlain() throws Exception {
     @Test
     public void testGetData() throws Exception {
         //setup
-        final Data data = new Data<List>("testKey", new LinkedList());
+        final Data data = new Data("testkey", new LinkedList());
         conversationStep.storeData(data);
 
         //assert
-        Assert.assertNotNull(conversationStep.getData("testKey"));
-        Assert.assertEquals(data, conversationStep.getData("testKey"));
+        Assert.assertNotNull(conversationStep.getData("testkey"));
+        Assert.assertEquals(data, conversationStep.getData("testkey"));
     }
 
     @Test
     public void testGetAllData() throws Exception {
         //setup
-        final Data data1 = new Data<List>("testKey1", new LinkedList());
-        final Data data2 = new Data<List>("testKey2", new LinkedList());
+        final Data data1 = new Data("testkey1", new LinkedList());
+        final Data data2 = new Data("testkey2", new LinkedList());
         conversationStep.storeData(data1);
         conversationStep.storeData(data2);
 
         //test
-        final List<IData<List>> allData = conversationStep.getAllData("testKey");
+        final List<IData> allData = conversationStep.getAllData("testkey");
 
         //assert
         Assert.assertNotNull(allData);
@@ -71,8 +71,8 @@ public void testGetAllData() throws Exception {
     @Test
     public void testGetAllKeys() throws Exception {
         //setup
-        final Data data1 = new Data<List>("testKey1", new LinkedList());
-        final Data data2 = new Data<List>("testKey2", new LinkedList());
+        final Data data1 = new Data("testkey1", new LinkedList());
+        final Data data2 = new Data("testkey2", new LinkedList());
         conversationStep.storeData(data1);
         conversationStep.storeData(data2);
 
@@ -81,16 +81,16 @@ public void testGetAllKeys() throws Exception {
 
         //assert
         Assert.assertNotNull(allKeys);
-        Assert.assertEquals("testKey1", allKeys.toArray()[0]);
-        Assert.assertEquals("testKey2", allKeys.toArray()[1]);
+        Assert.assertEquals("testkey1", allKeys.toArray()[0]);
+        Assert.assertEquals("testkey2", allKeys.toArray()[1]);
 
     }
 
     @Test
     public void testGetAllElements() throws Exception {
         //setup
-        final Data data1 = new Data<>("testKey1", "testData1");
-        final Data data2 = new Data<>("testKey2", "testData2");
+        final Data data1 = new Data("testkey1", "testData1");
+        final Data data2 = new Data("testkey2", "testData2");
         conversationStep.storeData(data1);
         conversationStep.storeData(data2);
 
@@ -106,7 +106,7 @@ public void testGetAllElements() throws Exception {
     @Test
     public void testSize() throws Exception {
         //setup
-        final Data data1 = new Data<List>("testKey1", new LinkedList());
+        final Data data1 = new Data("testkey1", new LinkedList());
         conversationStep.storeData(data1);
 
         //assert
@@ -116,7 +116,7 @@ public void testSize() throws Exception {
     @Test
     public void testIsEmpty() throws Exception {
         //setup
-        final Data data1 = new Data<List>("testKey1", new LinkedList());
+        final Data data1 = new Data("testkey1", new LinkedList());
         conversationStep.storeData(data1);
 
         //assert
@@ -126,7 +126,7 @@ public void testIsEmpty() throws Exception {
     @Test
     public void testEquals() throws Exception {
         //setup
-        final Data data = new Data<List>("testKey", new LinkedList());
+        final Data data = new Data("testkey", new LinkedList());
         this.conversationStep.storeData(data);
         ConversationStep conversationStep = new ConversationStep(new ConversationMemory.ConversationContext());
         conversationStep.storeData(data);
diff --git a/coreserver/src/main/java/ai/labs/core/CoreRuntime.java b/coreserver/src/main/java/ai/labs/core/CoreRuntime.java
index 997e65c56..227371c6a 100644
--- a/coreserver/src/main/java/ai/labs/core/CoreRuntime.java
+++ b/coreserver/src/main/java/ai/labs/core/CoreRuntime.java
@@ -63,6 +63,10 @@ public static void initializeBehaviourRuleRegistry() {
                 attribute("expressions", "List<Expression>", "").build();
         behaviorRuleExtensionRegistry.register(inputMatcherDescriptor.getId(), inputMatcherDescriptor);
 
+        IExtensionDescriptor propertyMatcherDescriptor = ExtensionDescriptorBuilder.create(PropertyMatcher.ID, "", "ai.labs.core.behavior.extensions.PropertyMatcher").
+                attribute("expressions", "List<Expression>", "").build();
+        behaviorRuleExtensionRegistry.register(propertyMatcherDescriptor.getId(), propertyMatcherDescriptor);
+
         IExtensionDescriptor connectorDescriptor = ExtensionDescriptorBuilder.create(Connector.ID, "", "ai.labs.core.behavior.extensions.Connector").
                 attribute("operator", "String", "").build();
         behaviorRuleExtensionRegistry.register(connectorDescriptor.getId(), connectorDescriptor);
@@ -80,6 +84,12 @@ public static void initializeBehaviourRuleRegistry() {
                 attribute("behaviorRuleName", "String", "").build();
         behaviorRuleExtensionRegistry.register(occurrenceDescriptor.getId(), occurrenceDescriptor);
 
+        IExtensionDescriptor outputReferenceDescriptor = ExtensionDescriptorBuilder.create(OutputReference.ID, "", "ai.labs.core.behavior.extensions.OutputReference").
+                attribute("inputValue", "String", "").
+                attribute("sessionValue", "String", "").
+                attribute("filter", "String", "").build();
+        behaviorRuleExtensionRegistry.register(outputReferenceDescriptor.getId(), outputReferenceDescriptor);
+
         IExtensionDescriptor resultSizeDescriptor = ExtensionDescriptorBuilder.create(ResultSize.ID, "", "ai.labs.core.behavior.extensions.ResultSize").
                 attribute("max", "Integer", "").
                 attribute("min", "Integer", "").
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorGroup.java b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorGroup.java
index 8c37a5e67..9166c9ff6 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorGroup.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorGroup.java
@@ -1,21 +1,32 @@
 package ai.labs.core.behavior;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import java.util.LinkedList;
 import java.util.List;
 
 /**
  * @author ginccc
  */
-@Getter
-@Setter
 public class BehaviorGroup {
     private String name;
     private List<BehaviorRule> behaviorRules;
 
-    BehaviorGroup() {
-        behaviorRules = new LinkedList<>();
+    public BehaviorGroup() {
+        behaviorRules = new LinkedList<BehaviorRule>();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<BehaviorRule> getBehaviorRules() {
+        return behaviorRules;
+    }
+
+    public void setBehaviorRules(List<BehaviorRule> behaviorRules) {
+        this.behaviorRules = behaviorRules;
     }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRule.java b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRule.java
index 517b4b62b..9119c6c10 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRule.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRule.java
@@ -2,9 +2,6 @@
 
 import ai.labs.core.behavior.extensions.IExtension;
 import ai.labs.memory.IConversationMemory;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.LinkedList;
@@ -14,23 +11,56 @@
  * @author ginccc
  */
 @Slf4j
-@NoArgsConstructor
-@Getter
-@Setter
 public class BehaviorRule implements Cloneable {
     private String name;
-    private List<String> actions = new LinkedList<>();
-    private List<IExtension> extensions = new LinkedList<>();
+    private List<String> actions;
+    private List<IExtension> extensions;
+
+    public BehaviorRule() {
+        actions = new LinkedList<>();
+        extensions = new LinkedList<>();
+    }
 
     public BehaviorRule(String name) {
         this.name = name;
+        actions = new LinkedList<>();
+        extensions = new LinkedList<>();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<String> getActions() {
+        return actions;
+    }
+
+    public void setActions(List<String> actions) {
+        this.actions = actions;
+    }
+
+    public void setExtensions(List<IExtension> extensions) {
+        this.extensions = extensions;
+    }
+
+    public List<IExtension> getExtensions() {
+        return extensions;
     }
 
-    public IExtension.ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace)
-            throws InfiniteLoopException {
+    public IExtension.ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) {
         if (trace.contains(this)) {
-            // this is an infinite loop, thus throw error
-            throw throwInfiniteLoopError(trace);
+            List<BehaviorRule> endlessLoop = trace.subList(trace.indexOf(this), trace.size());
+            endlessLoop.add(this);
+
+            log.error("reached endless loop:");
+            for (BehaviorRule status : trace)
+                log.error(" -> " + status.getName());
+
+            return IExtension.ExecutionState.ERROR;
         } else {
             trace.add(this);
 
@@ -46,7 +76,7 @@ public IExtension.ExecutionState execute(IConversationMemory memory, List<Behavi
                 }
             }
 
-            List<BehaviorRule> tmp = new LinkedList<>(trace);
+            List<BehaviorRule> tmp = new LinkedList<BehaviorRule>(trace);
             trace.clear();
             trace.addAll(tmp.subList(0, tmp.indexOf(this)));
 
@@ -57,18 +87,6 @@ public IExtension.ExecutionState execute(IConversationMemory memory, List<Behavi
         }
     }
 
-    private InfiniteLoopException throwInfiniteLoopError(List<BehaviorRule> trace)
-            throws InfiniteLoopException {
-        StringBuilder errorMessage = new StringBuilder();
-
-        errorMessage.append("reached infinite  loop:\n");
-        for (BehaviorRule status : trace) {
-            errorMessage.append(" -> ").append(status.getName()).append("\n");
-        }
-
-        return new InfiniteLoopException(errorMessage.toString());
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -83,7 +101,7 @@ public boolean equals(Object o) {
     public BehaviorRule clone() throws CloneNotSupportedException {
         BehaviorRule clone = new BehaviorRule(name);
 
-        List<IExtension> executablesClone = new LinkedList<>();
+        List<IExtension> executablesClone = new LinkedList<IExtension>();
         for (IExtension extension : extensions) {
             IExtension exClone = extension.clone();
             executablesClone.add(exClone);
@@ -97,10 +115,4 @@ public BehaviorRule clone() throws CloneNotSupportedException {
     public String toString() {
         return name;
     }
-
-    public class InfiniteLoopException extends Exception {
-        InfiniteLoopException(String message) {
-            super(message);
-        }
-    }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRuleSetParser.java b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRuleSetParser.java
new file mode 100644
index 000000000..fd216beb9
--- /dev/null
+++ b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRuleSetParser.java
@@ -0,0 +1,10 @@
+package ai.labs.core.behavior;
+
+/**
+ * @author ginccc
+ */
+public class BehaviorRuleSetParser {
+    public BehaviorSet parseJSONBehaviorRuleSet(String json) {
+        return new BehaviorSet();
+    }
+}
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRulesEvaluationTask.java b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRulesEvaluationTask.java
index 4025ecb4c..aef27a467 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRulesEvaluationTask.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRulesEvaluationTask.java
@@ -1,5 +1,6 @@
 package ai.labs.core.behavior;
 
+import ai.labs.lifecycle.AbstractLifecycleTask;
 import ai.labs.lifecycle.ILifecycleTask;
 import ai.labs.lifecycle.LifecycleException;
 import ai.labs.lifecycle.PackageConfigurationException;
@@ -16,6 +17,7 @@
 import javax.inject.Singleton;
 import java.io.IOException;
 import java.net.URI;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -26,20 +28,21 @@
  */
 @Singleton
 @Slf4j
-public class BehaviorRulesEvaluationTask implements ILifecycleTask {
+public class BehaviorRulesEvaluationTask extends AbstractLifecycleTask implements ILifecycleTask {
     private BehaviorRulesEvaluator evaluator;
     private static final String BEHAVIOR_CONFIG = "uri";
     private final IResourceClientLibrary resourceClientLibrary;
     private final IJsonSerialization jsonSerialization;
-    private final IBehaviorDeserialization behaviorSerialization;
+    private final IBehaviorSerialization behaviorSerialization;
 
     @Inject
     public BehaviorRulesEvaluationTask(IResourceClientLibrary resourceClientLibrary,
                                        IJsonSerialization jsonSerialization,
-                                       IBehaviorDeserialization behaviorSerialization) {
+                                       IBehaviorSerialization behaviorSerialization) {
         this.resourceClientLibrary = resourceClientLibrary;
         this.jsonSerialization = jsonSerialization;
         this.behaviorSerialization = behaviorSerialization;
+        this.evaluator = new BehaviorRulesEvaluator();
     }
 
     @Override
@@ -52,6 +55,16 @@ public Object getComponent() {
         return evaluator;
     }
 
+    @Override
+    public List<String> getComponentDependencies() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<String> getOutputDependencies() {
+        return Collections.emptyList();
+    }
+
     @Override
     public void executeTask(IConversationMemory memory) throws LifecycleException {
         BehaviorSetResult results;
@@ -77,14 +90,14 @@ private void addActionsToConversationMemory(IConversationMemory memory, List<Beh
             allActions.addAll(successRule.getActions());
         }
 
-        Data actions = new Data<>("actions", allActions);
+        Data actions = new Data("actions", allActions);
         actions.setPublic(true);
         memory.getCurrentStep().storeData(actions);
     }
 
     private void storeResultIfNotEmpty(IConversationMemory memory, String key, List<BehaviorRule> result) {
         if (!result.isEmpty()) {
-            memory.getCurrentStep().storeData(new Data<>(key, convert(result)));
+            memory.getCurrentStep().storeData(new Data(key, convert(result)));
         }
     }
 
@@ -103,7 +116,7 @@ public void configure(Map<String, Object> configuration) throws PackageConfigura
             String behaviorConfigJson = jsonSerialization.serialize(behaviorConfiguration);
             BehaviorSet behaviorSet = behaviorSerialization.deserialize(behaviorConfigJson);
 
-            evaluator = new BehaviorRulesEvaluator(behaviorSet);
+            evaluator.setBehaviorSet(behaviorSet);
 
         } catch (IOException | DeserializationException e) {
             String message = "Error while configuring BehaviorRuleLifecycleTask!";
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRulesEvaluator.java b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRulesEvaluator.java
index 38da61798..54abd59a5 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRulesEvaluator.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorRulesEvaluator.java
@@ -3,7 +3,6 @@
 import ai.labs.core.behavior.extensions.IExtension;
 import ai.labs.memory.IConversationMemory;
 import ai.labs.utilities.RuntimeUtilities;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.LinkedList;
@@ -12,11 +11,17 @@
  * @author ginccc
  */
 @Slf4j
-@AllArgsConstructor
-class BehaviorRulesEvaluator {
+public class BehaviorRulesEvaluator {
     private BehaviorSet behaviorSet;
 
-    BehaviorSetResult evaluate(IConversationMemory memory) throws BehaviorRuleExecutionException {
+    public BehaviorRulesEvaluator() {
+    }
+
+    public void setBehaviorSet(BehaviorSet behaviorSet) {
+        this.behaviorSet = behaviorSet;
+    }
+
+    public BehaviorSetResult evaluate(IConversationMemory memory) throws BehaviorRuleExecutionException {
         RuntimeUtilities.checkNotNull(behaviorSet, "behaviorSet");
 
         BehaviorSetResult resultSet = new BehaviorSetResult();
@@ -32,11 +37,7 @@ BehaviorSetResult evaluate(IConversationMemory memory) throws BehaviorRuleExecut
                 if (behaviorRule.getExtensions().isEmpty()) {
                     state = IExtension.ExecutionState.SUCCESS;
                 } else {
-                    try {
-                        state = behaviorRule.execute(memory, new LinkedList<>());
-                    } catch (BehaviorRule.InfiniteLoopException e) {
-                        throw new BehaviorRuleExecutionException(e.getLocalizedMessage(), e);
-                    }
+                    state = behaviorRule.execute(memory, new LinkedList<>());
                 }
 
                 if (state == IExtension.ExecutionState.SUCCESS) {
@@ -71,9 +72,5 @@ class BehaviorRuleExecutionException extends Exception {
         private BehaviorRuleExecutionException(String message) {
             super(message);
         }
-
-        BehaviorRuleExecutionException(String message, Exception e) {
-            super(message, e);
-        }
     }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorDeserialization.java b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSerialization.java
similarity index 62%
rename from coreserver/src/main/java/ai/labs/core/behavior/BehaviorDeserialization.java
rename to coreserver/src/main/java/ai/labs/core/behavior/BehaviorSerialization.java
index 8b3a9dc3d..b8fdf4797 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorDeserialization.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSerialization.java
@@ -12,17 +12,19 @@
 
 import javax.inject.Inject;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.util.LinkedList;
 import java.util.List;
 
 /**
  * @author ginccc
  */
-public class BehaviorDeserialization implements IBehaviorDeserialization {
+public class BehaviorSerialization implements IBehaviorSerialization {
+
     private final ObjectMapper objectMapper;
 
     @Inject
-    public BehaviorDeserialization(ObjectMapper objectMapper) {
+    public BehaviorSerialization(ObjectMapper objectMapper) {
         this.objectMapper = objectMapper;
     }
 
@@ -52,7 +54,7 @@ public BehaviorSet deserialize(String json) throws DeserializationException {
     }
 
     private static List<IExtension> convert(List<BehaviorRuleElementConfiguration> children, BehaviorSet behaviorSet) throws CloneNotSupportedException, IExtensionRegistry.ExtensionRegistryException {
-        List<IExtension> ret = new LinkedList<>();
+        List<IExtension> ret = new LinkedList<IExtension>();
         for (BehaviorRuleElementConfiguration child : children) {
             IExtension extension = BehaviorRuleExtensionRegistry.getInstance().getExtension(child.getType());
             extension.setValues(child.getValues());
@@ -69,4 +71,48 @@ private static List<IExtension> convert(List<BehaviorRuleElementConfiguration> c
 
         return ret;
     }
+
+    @Override
+    public String serialize(BehaviorSet set) throws IOException {
+        BehaviorConfiguration result = new BehaviorConfiguration();
+
+        for (BehaviorGroup group : set.getBehaviorGroups()) {
+            BehaviorGroupConfiguration behaviorGroupConfiguration = new BehaviorGroupConfiguration();
+            behaviorGroupConfiguration.setName(group.getName());
+            result.getBehaviorGroups().add(behaviorGroupConfiguration);
+            for (BehaviorRule behaviorRule : group.getBehaviorRules()) {
+                behaviorGroupConfiguration.getBehaviorRules().add(convert(behaviorRule));
+            }
+        }
+
+        StringWriter writer = new StringWriter();
+        objectMapper.writeValue(writer, result);
+
+        return writer.toString();
+    }
+
+    private static BehaviorRuleConfiguration convert(BehaviorRule behaviorRule) {
+        BehaviorRuleConfiguration result = new BehaviorRuleConfiguration();
+
+        result.setName(behaviorRule.getName());
+        result.setActions(behaviorRule.getActions());
+        for (IExtension extension : behaviorRule.getExtensions()) {
+            result.getChildren().add(convert(extension));
+        }
+
+        return result;
+    }
+
+    private static BehaviorRuleElementConfiguration convert(IExtension extension) {
+        BehaviorRuleElementConfiguration behaviorRuleElementJson = new BehaviorRuleElementConfiguration();
+
+        behaviorRuleElementJson.setType(extension.getId());
+        behaviorRuleElementJson.getValues().putAll(extension.getValues());
+
+        for (IExtension e : extension.getChildren()) {
+            behaviorRuleElementJson.getChildren().add(convert(e));
+        }
+
+        return behaviorRuleElementJson;
+    }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSet.java b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSet.java
index a33fc0b4d..78d390ff3 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSet.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSet.java
@@ -1,23 +1,19 @@
 package ai.labs.core.behavior;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
 import java.util.LinkedList;
 import java.util.List;
 
 /**
  * @author ginccc
  */
-@NoArgsConstructor
-@Getter
-@Setter
 public class BehaviorSet {
-    private List<BehaviorGroup> behaviorGroups = new LinkedList<>();
+    private List<BehaviorGroup> behaviorGroups = new LinkedList<BehaviorGroup>();
+
+    public BehaviorSet() {
+    }
 
     public List<BehaviorRule> getBehaviorRule(String behaviorRule) {
-        List<BehaviorRule> ret = new LinkedList<>();
+        List<BehaviorRule> ret = new LinkedList<BehaviorRule>();
         for (BehaviorGroup behaviorGroup : behaviorGroups) {
             for (BehaviorRule status : behaviorGroup.getBehaviorRules()) {
                 if (status.getName().equals(behaviorRule)) {
@@ -28,4 +24,12 @@ public List<BehaviorRule> getBehaviorRule(String behaviorRule) {
 
         return ret;
     }
+
+    public List<BehaviorGroup> getBehaviorGroups() {
+        return behaviorGroups;
+    }
+
+    public void setBehaviorGroups(List<BehaviorGroup> behaviorGroups) {
+        this.behaviorGroups = behaviorGroups;
+    }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSetResult.java b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSetResult.java
index 29a1cd96d..ebfa526eb 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSetResult.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/BehaviorSetResult.java
@@ -1,22 +1,52 @@
 package ai.labs.core.behavior;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
 import java.util.LinkedList;
 import java.util.List;
 
 /**
  * @author ginccc
  */
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
 public class BehaviorSetResult {
-    private List<BehaviorRule> successRules = new LinkedList<>();
-    private List<BehaviorRule> droppedSuccessRules = new LinkedList<>();
-    private List<BehaviorRule> failRules = new LinkedList<>();
+    private List<BehaviorRule> successRules;
+    private List<BehaviorRule> droppedSuccessRules;
+    private List<BehaviorRule> failRules;
+
+    public BehaviorSetResult() {
+        successRules = new LinkedList<BehaviorRule>();
+        droppedSuccessRules = new LinkedList<BehaviorRule>();
+        failRules = new LinkedList<BehaviorRule>();
+    }
+
+    public List<BehaviorRule> getSuccessRules() {
+        return successRules;
+    }
+
+    public void setSuccessRules(List<BehaviorRule> successRules) {
+        this.successRules = successRules;
+    }
+
+    public List<BehaviorRule> getDroppedSuccessRules() {
+        return droppedSuccessRules;
+    }
+
+    public void setDroppedSuccessRules(List<BehaviorRule> droppedSuccessRules) {
+        this.droppedSuccessRules = droppedSuccessRules;
+    }
+
+    public List<BehaviorRule> getFailRules() {
+        return failRules;
+    }
+
+    public void setFailRules(List<BehaviorRule> failRules) {
+        this.failRules = failRules;
+    }
+
+    @Override
+    public String toString() {
+        return "BehaviorSetResult{" +
+                "successRules=" + successRules +
+                ", droppedSuccessRules=" + droppedSuccessRules +
+                ", failRules=" + failRules +
+                '}';
+    }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/IBehaviorDeserialization.java b/coreserver/src/main/java/ai/labs/core/behavior/IBehaviorSerialization.java
similarity index 59%
rename from coreserver/src/main/java/ai/labs/core/behavior/IBehaviorDeserialization.java
rename to coreserver/src/main/java/ai/labs/core/behavior/IBehaviorSerialization.java
index c06b9570e..f0699ea1b 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/IBehaviorDeserialization.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/IBehaviorSerialization.java
@@ -2,9 +2,13 @@
 
 import ai.labs.serialization.DeserializationException;
 
+import java.io.IOException;
+
 /**
  * @author ginccc
  */
-public interface IBehaviorDeserialization {
+public interface IBehaviorSerialization {
     BehaviorSet deserialize(String json) throws DeserializationException;
+
+    String serialize(BehaviorSet set) throws IOException;
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/Connector.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/Connector.java
index 4ee82b382..41452f981 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/Connector.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/Connector.java
@@ -1,10 +1,8 @@
 package ai.labs.core.behavior.extensions;
 
 import ai.labs.core.behavior.BehaviorRule;
+import ai.labs.core.behavior.BehaviorSet;
 import ai.labs.memory.IConversationMemory;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 import java.util.*;
 
@@ -12,7 +10,6 @@
 /**
  * @author ginccc
  */
-@NoArgsConstructor
 public class Connector implements IExtension {
     public static final String ID = "connector";
     private final String operatorQualifier = "operator";
@@ -21,18 +18,32 @@ public enum Operator {
         OR, AND
     }
 
-    private Operator operator;
+    protected Operator operator;
 
-    @Getter
-    @Setter
-    private List<IExtension> extensions = new LinkedList<>();
+    private List<IExtension> extensions = new LinkedList<IExtension>();
 
     private ExecutionState state = ExecutionState.NOT_EXECUTED;
 
-    private Connector(Operator operator) {
+    public Connector() {
+        this(Operator.OR); // default: OR
+    }
+
+    public Connector(String operator) {
+        this(operator.equals("or") ? Operator.OR : Operator.AND);
+    }
+
+    public Connector(Operator operator) {
         this.operator = operator;
     }
 
+    public void setExtensions(List<IExtension> extensions) {
+        this.extensions = extensions;
+    }
+
+    public void addExecutable(IExtension extension) {
+        extensions.add(extension);
+    }
+
     @Override
     public String getId() {
         return ID;
@@ -40,7 +51,7 @@ public String getId() {
 
     @Override
     public Map<String, String> getValues() {
-        Map<String, String> values = new HashMap<>();
+        Map<String, String> values = new HashMap<String, String>();
         values.put(operatorQualifier, operator.name());
         return values;
     }
@@ -65,8 +76,7 @@ public IExtension[] getChildren() {
         return extensions.toArray(new IExtension[extensions.size()]);
     }
 
-    public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace)
-            throws BehaviorRule.InfiniteLoopException {
+    public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) {
         if (operator == Operator.OR) {
             state = ExecutionState.FAIL;
 
@@ -112,7 +122,7 @@ public ExecutionState getExecutionState() {
     public IExtension clone() throws CloneNotSupportedException {
         Connector clone = new Connector(operator);
 
-        List<IExtension> extensionClone = new LinkedList<>();
+        List<IExtension> extensionClone = new LinkedList<IExtension>();
         for (IExtension extension : extensions) {
             extensionClone.add(extension.clone());
         }
@@ -127,4 +137,9 @@ public IExtension clone() throws CloneNotSupportedException {
     public void setChildren(IExtension... extensions) {
         this.extensions.addAll(Arrays.asList(extensions));
     }
+
+    @Override
+    public void setContainingBehaviorRuleSet(BehaviorSet behaviorSet) {
+        //not implemented
+    }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/Dependency.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/Dependency.java
index 5af270625..82e88d17c 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/Dependency.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/Dependency.java
@@ -4,7 +4,6 @@
 import ai.labs.core.behavior.BehaviorRule;
 import ai.labs.core.behavior.BehaviorSet;
 import ai.labs.memory.IConversationMemory;
-import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
@@ -16,7 +15,6 @@
  * @author ginccc
  */
 @Slf4j
-@NoArgsConstructor
 public class Dependency implements IExtension {
     public static final String ID = "dependency";
 
@@ -26,7 +24,11 @@ public class Dependency implements IExtension {
     private final String referenceQualifier = "reference";
     private BehaviorSet behaviorSet;
 
-    private Dependency(String referencedRuleName) {
+    public Dependency() {
+        // empty default constructor
+    }
+
+    public Dependency(String referencedRuleName) {
         this.reference = referencedRuleName;
     }
 
@@ -52,8 +54,12 @@ public void setValues(Map<String, String> values) {
     }
 
     @Override
-    public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace)
-            throws BehaviorRule.InfiniteLoopException {
+    public IExtension[] getChildren() {
+        return new IExtension[0];
+    }
+
+    @Override
+    public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) {
 
         //before we execute the behavior rules we make deep copies, so that we don't change the rules in conversation memory!
         List<BehaviorRule> filteredBehaviorRules = new LinkedList<BehaviorRule>();
@@ -116,6 +122,11 @@ private List<BehaviorRule> cloneBehaviorRules(List<BehaviorRule> behaviorRules,
         return clone;
     }
 
+    @Override
+    public void setChildren(IExtension... extensions) {
+        //not
+    }
+
     @Override
     public void setContainingBehaviorRuleSet(BehaviorSet behaviorSet) {
         this.behaviorSet = behaviorSet;
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/IExtension.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/IExtension.java
index 87e103e1d..90ffac7da 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/IExtension.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/IExtension.java
@@ -17,17 +17,11 @@ public interface IExtension extends Cloneable {
 
     void setValues(Map<String, String> values);
 
-    default IExtension[] getChildren() {
-        return new IExtension[0];
-    }
+    IExtension[] getChildren();
 
-    default void setChildren(IExtension... extensions) {
-        // not implemented
-    }
+    void setChildren(IExtension... extensions);
 
-    default void setContainingBehaviorRuleSet(BehaviorSet behaviorSet) {
-        // not implemented
-    }
+    void setContainingBehaviorRuleSet(BehaviorSet behaviorSet);
 
     enum ExecutionState {
         SUCCESS,
@@ -36,7 +30,7 @@ enum ExecutionState {
         ERROR
     }
 
-    ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) throws BehaviorRule.InfiniteLoopException;
+    ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace);
 
     ExecutionState getExecutionState();
 
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/InputMatcher.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/InputMatcher.java
index 6e7a25d7f..cba4c16bd 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/InputMatcher.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/InputMatcher.java
@@ -1,6 +1,7 @@
 package ai.labs.core.behavior.extensions;
 
 import ai.labs.core.behavior.BehaviorRule;
+import ai.labs.core.behavior.BehaviorSet;
 import ai.labs.expressions.Expression;
 import ai.labs.expressions.utilities.IExpressionProvider;
 import ai.labs.memory.IConversationMemory;
@@ -27,10 +28,10 @@ public class InputMatcher implements IExtension {
     private boolean ignorePunctuationExpressions = false;
     private ExecutionState state = ExecutionState.NOT_EXECUTED;
     private final String expressionsQualifier = "expressions";
-    private IExpressionProvider expressionProvider;
+    private IExpressionProvider expressionUtilities;
 
     public InputMatcher() {
-        expressionProvider = DependencyInjector.getInstance().getInstance(IExpressionProvider.class);
+        expressionUtilities = DependencyInjector.getInstance().getInstance(IExpressionProvider.class);
     }
 
     public InputMatcher(List<Expression> expression) {
@@ -63,7 +64,7 @@ public Map<String, String> getValues() {
     public void setValues(Map<String, String> values) {
         if (values != null && !values.isEmpty()) {
             if (values.containsKey(expressionsQualifier)) {
-                expressions = expressionProvider.parseExpressions(values.get(expressionsQualifier));
+                expressions = expressionUtilities.parseExpressions(values.get(expressionsQualifier));
             }
 
             /*if (values.containsKey(contextQualifier))
@@ -81,12 +82,17 @@ public void setValues(Map<String, String> values) {
         }
     }
 
+    @Override
+    public IExtension[] getChildren() {
+        return new IExtension[0];
+    }
+
     @Override
     public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) {
         List<Expression> inputExpressions;
 
         IData data = memory.getCurrentStep().getLatestData("expression");
-        inputExpressions = data != null ? expressionProvider.parseExpressions(data.getResult().toString()) : new LinkedList<>();
+        inputExpressions = data != null ? expressionUtilities.parseExpressions(data.getResult().toString()) : new LinkedList<>();
         inputExpressions = filterExpressions(inputExpressions);
 
         boolean isInputEmpty = expressions.size() == 1 &&
@@ -148,4 +154,14 @@ public IExtension clone() throws CloneNotSupportedException {
         clone.setValues(getValues());
         return clone;
     }
+
+    @Override
+    public void setChildren(IExtension... extensions) {
+        //not implemented
+    }
+
+    @Override
+    public void setContainingBehaviorRuleSet(BehaviorSet behaviorSet) {
+        //not implemented
+    }
 }
\ No newline at end of file
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/Negation.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/Negation.java
index 677451460..23d7aead7 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/Negation.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/Negation.java
@@ -3,7 +3,6 @@
 import ai.labs.core.behavior.BehaviorRule;
 import ai.labs.core.behavior.BehaviorSet;
 import ai.labs.memory.IConversationMemory;
-import lombok.NoArgsConstructor;
 
 import java.util.Collections;
 import java.util.List;
@@ -12,12 +11,18 @@
 /**
  * @author ginccc
  */
-@NoArgsConstructor
 public class Negation implements IExtension {
     public static final String ID = "negation";
     private IExtension extension;
     private ExecutionState state = ExecutionState.NOT_EXECUTED;
 
+    public Negation() {
+    }
+
+    public Negation(IExtension extension) {
+        this.extension = extension;
+    }
+
     @Override
     public String getId() {
         return ID;
@@ -39,8 +44,7 @@ public IExtension[] getChildren() {
     }
 
     @Override
-    public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace)
-            throws BehaviorRule.InfiniteLoopException {
+    public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) {
         if (extension != null) {
             ExecutionState stateOfExecutable = extension.execute(memory, trace);
 
@@ -59,7 +63,7 @@ public ExecutionState getExecutionState() {
         return state;
     }
 
-    private void setExtension(IExtension extension) {
+    public void setExtension(IExtension extension) {
         this.extension = extension;
     }
 
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/Occurrence.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/Occurrence.java
index b81fc662d..8779d986d 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/Occurrence.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/Occurrence.java
@@ -1,9 +1,9 @@
 package ai.labs.core.behavior.extensions;
 
 import ai.labs.core.behavior.BehaviorRule;
+import ai.labs.core.behavior.BehaviorSet;
 import ai.labs.memory.IConversationMemory;
 import ai.labs.memory.IData;
-import lombok.NoArgsConstructor;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -13,7 +13,6 @@
 /**
  * @author ginccc
  */
-@NoArgsConstructor
 public class Occurrence implements IExtension {
     public static final String ID = "occurrence";
     private static final String BEHAVIOR_RULES_SUCCESS = "behavior_rules:success";
@@ -26,15 +25,18 @@ public class Occurrence implements IExtension {
 
     private ExecutionState state = ExecutionState.NOT_EXECUTED;
 
+    public Occurrence() {
+    }
+
     public void setBehaviorRuleName(String behaviorRuleName) {
         this.behaviorRuleName = behaviorRuleName;
     }
 
-    private void setMaxOccurrence(int maxOccurrence) {
+    public void setMaxOccurrence(int maxOccurrence) {
         this.maxOccurrence = maxOccurrence;
     }
 
-    private int countOccurrences(List<List<String>> allBehaviorRulesHistorical) {
+    public int countOccurrences(List<List<String>> allBehaviorRulesHistorical) {
         int occurrences = 0;
         for (List<String> history : allBehaviorRulesHistorical) {
             for (String behaviorRuleName : history) {
@@ -47,11 +49,11 @@ private int countOccurrences(List<List<String>> allBehaviorRulesHistorical) {
         return occurrences;
     }
 
-    private List<List<String>> getAllBehaviorRules(List<List<IData<List<String>>>> allData) {
-        List<List<String>> allBehaviorRules = new LinkedList<>();
-        for (List<IData<List<String>>> dataList : allData) {
-            for (IData<List<String>> data : dataList) {
-                allBehaviorRules.add(data.getResult());
+    private List<List<String>> getAllBehaviorRules(List<List<IData>> allData) {
+        List<List<String>> allBehaviorRules = new LinkedList<List<String>>();
+        for (List<IData> dataList : allData) {
+            for (IData data : dataList) {
+                allBehaviorRules.add((List<String>) data.getResult());
             }
         }
 
@@ -65,7 +67,7 @@ public String getId() {
 
     @Override
     public Map<String, String> getValues() {
-        HashMap<String, String> result = new HashMap<>();
+        HashMap<String, String> result = new HashMap<String, String>();
         result.put(maxOccurrenceQualifier, String.valueOf(maxOccurrence));
         result.put(behaviorRuleNameQualifier, behaviorRuleName);
         return result;
@@ -89,10 +91,20 @@ public void setValues(Map<String, String> values) {
         }
     }
 
+    @Override
+    public IExtension[] getChildren() {
+        return new IExtension[0];
+    }
+
+    @Override
+    public void setChildren(IExtension... extensions) {
+        //not implemented
+    }
+
     @Override
     public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) {
         boolean success;
-        List<List<IData<List<String>>>> allData = memory.getAllSteps().getAllData(BEHAVIOR_RULES_SUCCESS);
+        List<List<IData>> allData = memory.getAllSteps().getAllData(BEHAVIOR_RULES_SUCCESS);
         if (allData != null) {
             int actualOccurrences = countOccurrences(getAllBehaviorRules(allData));
             if (maxOccurrence == -1) {
@@ -126,4 +138,9 @@ public IExtension clone() throws CloneNotSupportedException {
 
         return occurrence;
     }
+
+    @Override
+    public void setContainingBehaviorRuleSet(BehaviorSet behaviorSet) {
+        //not implemented
+    }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/OutputReference.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/OutputReference.java
new file mode 100644
index 000000000..86e6da73f
--- /dev/null
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/OutputReference.java
@@ -0,0 +1,147 @@
+package ai.labs.core.behavior.extensions;
+
+import ai.labs.core.behavior.BehaviorRule;
+import ai.labs.core.behavior.BehaviorSet;
+import ai.labs.expressions.Expression;
+import ai.labs.expressions.utilities.IExpressionProvider;
+import ai.labs.memory.IConversationMemory;
+import ai.labs.runtime.DependencyInjector;
+import ai.labs.utilities.CharacterUtilities;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ginccc
+ */
+public class OutputReference implements IExtension {
+    public static final String PART = "part";
+    public static final String EQUAL = "equal";
+
+    private List<Expression> filter;      // any expression which should be checked; '*' is allowed
+    private String inputValue = "";         // part|equal
+    private String sessionValue = "";       // part|equal
+
+    private ExecutionState state = ExecutionState.NOT_EXECUTED;
+    private IConversationMemory memory;
+    public static final String ID = "outputReference";
+    private final String inputValueQualifier = "inputValue";
+    private final String sessionValueQualifier = "sessionValue";
+    private final String filterQualifier = "filter";
+    private IExpressionProvider expressionUtilities;
+
+    public OutputReference() {
+        //empty default constructor
+        expressionUtilities = DependencyInjector.getInstance().getInstance(IExpressionProvider.class);
+    }
+
+    public OutputReference(List<Expression> filter, String inputValue, String sessionValue) {
+        this.filter = filter;
+        this.inputValue = inputValue;
+        this.sessionValue = sessionValue;
+    }
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+
+    @Override
+    public Map<String, String> getValues() {
+        Map<String, String> values = new HashMap<String, String>();
+
+        values.put(inputValueQualifier, inputValue);
+        values.put(sessionValueQualifier, sessionValue);
+        values.put(filterQualifier, CharacterUtilities.arrayToString(filter, ","));
+
+        return values;
+    }
+
+    @Override
+    public void setValues(Map<String, String> values) {
+        if (values != null && !values.isEmpty()) {
+            if (values.containsKey(inputValueQualifier)) {
+                inputValue = values.get(inputValueQualifier);
+            }
+
+            if (values.containsKey(sessionValueQualifier)) {
+                sessionValue = values.get(sessionValueQualifier);
+            }
+
+            if (values.containsKey(filterQualifier)) {
+                filter = expressionUtilities.parseExpressions(values.get(filterQualifier));
+            }
+        }
+    }
+
+    @Override
+    public IExtension[] getChildren() {
+        return new IExtension[0];
+    }
+
+    @Override
+    public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) {
+        /* todo
+                if(inputValue.equals("") && sessionValue.equals(""))
+                    return ExecutionState.FAIL;
+
+                List<Expression> outputReferences = filter(filter, session.getConversationMemory().getMergedOutputReferences());
+                List<Expression> inputExpressions = filter(filter, session.getConversationMemory().getExpression());
+                List<Expression> sessionExpressions = filter(filter, session.getConversationMemory().getDomain().getAllCurrentProperties());
+
+                boolean input = false;
+                if(inputValue.equals(PART))
+                    input = outputReferences.size() > 0 && inputExpressions.size() > 0 && outputReferences.containsAll(inputExpressions);
+                else if(inputValue.equals(EQUAL))
+                    input = inputExpressions.equals(outputReferences);
+
+                boolean session = false;
+                if(sessionValue.equals(PART))
+                    session = outputReferences.size() > 0 && sessionExpressions.size() > 0 && outputReferences.containsAll(sessionExpressions);
+                else if(sessionValue.equals(EQUAL))
+                    session = sessionExpressions.equals(outputReferences);
+
+                if(input || session)
+                    state = ExecutionState.SUCCESS;
+                else
+                    state = ExecutionState.FAIL;
+        */
+        return state;
+    }
+
+    private List<Expression> filter(List<Expression> filter, List<Expression> list) {
+        List<Expression> ret = new LinkedList<Expression>();
+        for (Expression tmp : list)
+            for (Expression exp : filter)
+                if (exp.equals(tmp)) {
+                    ret.add(tmp);
+                    break;
+                }
+
+        return ret;
+    }
+
+    @Override
+    public ExecutionState getExecutionState() {
+        return state;
+    }
+
+    @Override
+    public IExtension clone() throws CloneNotSupportedException {
+        IExtension outputReference = new OutputReference();
+        outputReference.setValues(getValues());
+        return outputReference;
+    }
+
+    @Override
+    public void setChildren(IExtension... extensions) {
+        //not implemented
+    }
+
+    @Override
+    public void setContainingBehaviorRuleSet(BehaviorSet behaviorSet) {
+        //not implemented
+    }
+}
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/PropertyMatcher.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/PropertyMatcher.java
new file mode 100644
index 000000000..fdd09b00b
--- /dev/null
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/PropertyMatcher.java
@@ -0,0 +1,88 @@
+package ai.labs.core.behavior.extensions;
+
+import ai.labs.core.behavior.BehaviorRule;
+import ai.labs.core.behavior.BehaviorSet;
+import ai.labs.expressions.Expression;
+import ai.labs.expressions.utilities.IExpressionProvider;
+import ai.labs.memory.IConversationMemory;
+import ai.labs.runtime.DependencyInjector;
+import ai.labs.utilities.CharacterUtilities;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ginccc
+ */
+public class PropertyMatcher implements IExtension {
+    public static final String ID = "propertymatcher";
+
+    private List<Expression> expressions;
+
+    private ExecutionState state = ExecutionState.NOT_EXECUTED;
+    private final String expressionsQualifier = "expressions";
+    private IExpressionProvider expressionUtilities;
+
+    public PropertyMatcher() {
+        // empty default constructor
+        expressionUtilities = DependencyInjector.getInstance().getInstance(IExpressionProvider.class);
+    }
+
+    public PropertyMatcher(List<Expression> expressions) {
+        this.expressions = expressions;
+    }
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+
+    @Override
+    public Map<String, String> getValues() {
+        Map<String, String> result = new HashMap<String, String>();
+        result.put(expressionsQualifier, CharacterUtilities.arrayToString(expressions, ","));
+        return result;
+    }
+
+    @Override
+    public void setValues(Map<String, String> values) {
+        if (values != null && !values.isEmpty()) {
+            if (values.containsKey(expressionsQualifier)) {
+                expressions = expressionUtilities.parseExpressions(values.get(expressionsQualifier));
+            }
+        }
+    }
+
+    @Override
+    public IExtension[] getChildren() {
+        return new IExtension[0];
+    }
+
+    @Override
+    public ExecutionState execute(IConversationMemory memory, List<BehaviorRule> trace) {
+        return null;
+    }
+
+    @Override
+    public ExecutionState getExecutionState() {
+        return state;
+    }
+
+    @Override
+    public IExtension clone() throws CloneNotSupportedException {
+        IExtension clone = new PropertyMatcher();
+        clone.setValues(getValues());
+        return clone;
+    }
+
+    @Override
+    public void setChildren(IExtension... extensions) {
+        //not implemented
+    }
+
+    @Override
+    public void setContainingBehaviorRuleSet(BehaviorSet behaviorSet) {
+        //not implemented
+    }
+}
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/ResultSize.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/ResultSize.java
index 485c2ae44..2a4faa63f 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/ResultSize.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/ResultSize.java
@@ -1,10 +1,9 @@
 package ai.labs.core.behavior.extensions;
 
 import ai.labs.core.behavior.BehaviorRule;
+import ai.labs.core.behavior.BehaviorSet;
 import ai.labs.memory.IConversationMemory;
 import ai.labs.memory.IData;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -14,21 +13,33 @@
 /**
  * @author ginccc
  */
-@NoArgsConstructor
 public class ResultSize implements IExtension {
-    @Setter
     private int max = -1;
-    @Setter
     private int min = -1;
-    @Setter
     private int equal = -1;
 
     private ExecutionState state = ExecutionState.NOT_EXECUTED;
+    private IConversationMemory memory;
     public static final String ID = "resultSize";
     private final String minQualifier = "min";
     private final String maxQualifier = "max";
     private final String equalQualifier = "equal";
 
+    public ResultSize() {
+    }
+
+    public void setMax(int max) {
+        this.max = max;
+    }
+
+    public void setMin(int min) {
+        this.min = min;
+    }
+
+    public void setEqual(int equal) {
+        this.equal = equal;
+    }
+
     @Override
     public String getId() {
         return ID;
@@ -36,7 +47,7 @@ public String getId() {
 
     @Override
     public Map<String, String> getValues() {
-        Map<String, String> values = new HashMap<>();
+        Map<String, String> values = new HashMap<String, String>();
 
         values.put(minQualifier, String.valueOf(min));
         values.put(maxQualifier, String.valueOf(max));
@@ -62,13 +73,18 @@ public void setValues(Map<String, String> values) {
         }
     }
 
+    @Override
+    public IExtension[] getChildren() {
+        return new IExtension[0];
+    }
+
     @Override
     public ExecutionState execute(final IConversationMemory memory, final List<BehaviorRule> trace) {
         if (min == -1 && max == -1 && equal == -1) {
             return ExecutionState.NOT_EXECUTED;
         }
 
-        IData data = memory.getCurrentStep().getLatestData("result_size");
+        IData data = memory.getCurrentStep().getLatestData("external_search");
         List result;
         if (data != null) {
             result = (List) data.getResult();
@@ -115,4 +131,14 @@ public IExtension clone() throws CloneNotSupportedException {
         clone.setValues(getValues());
         return clone;
     }
+
+    @Override
+    public void setChildren(IExtension... extensions) {
+        //not implemented
+    }
+
+    @Override
+    public void setContainingBehaviorRuleSet(BehaviorSet behaviorSet) {
+        //not implemented
+    }
 }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/descriptor/BehaviorRuleExtensionRegistry.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/descriptor/BehaviorRuleExtensionRegistry.java
index 761a222c1..742563949 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/descriptor/BehaviorRuleExtensionRegistry.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/descriptor/BehaviorRuleExtensionRegistry.java
@@ -12,7 +12,7 @@
 public class BehaviorRuleExtensionRegistry implements IExtensionRegistry<IExtensionDescriptor, IExtension> {
 
     private static BehaviorRuleExtensionRegistry instance;
-    private Map<String, IExtensionDescriptor> descriptorMap = new HashMap<>();
+    private Map<String, IExtensionDescriptor> descriptorMap = new HashMap<String, IExtensionDescriptor>();
 
     public static BehaviorRuleExtensionRegistry getInstance() {
         if (instance == null) {
@@ -39,7 +39,11 @@ public IExtension getExtension(String id) throws ExtensionRegistryException {
             }
 
             throw new ExtensionRegistryException("No behavior extension found for id: " + id);
-        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+        } catch (ClassNotFoundException e) {
+            throw new ExtensionRegistryException(e.getLocalizedMessage(), e);
+        } catch (InstantiationException e) {
+            throw new ExtensionRegistryException(e.getLocalizedMessage(), e);
+        } catch (IllegalAccessException e) {
             throw new ExtensionRegistryException(e.getLocalizedMessage(), e);
         }
     }
diff --git a/coreserver/src/main/java/ai/labs/core/behavior/extensions/descriptor/ExtensionDescriptorBuilder.java b/coreserver/src/main/java/ai/labs/core/behavior/extensions/descriptor/ExtensionDescriptorBuilder.java
index fc06ee350..257e63f18 100644
--- a/coreserver/src/main/java/ai/labs/core/behavior/extensions/descriptor/ExtensionDescriptorBuilder.java
+++ b/coreserver/src/main/java/ai/labs/core/behavior/extensions/descriptor/ExtensionDescriptorBuilder.java
@@ -16,8 +16,8 @@ public class ExtensionDescriptorBuilder {
     private String description;
     private String className;
 
-    private Map<String, String> attributeDescriptions = new HashMap<>();
-    private Map<String, String> attributeTypes = new HashMap<>();
+    private Map<String, String> attributeDescriptions = new HashMap<String, String>();
+    private Map<String, String> attributeTypes = new HashMap<String, String>();
     private int maxChildCount = -1;
 
     private ExtensionDescriptorBuilder(String id, String description, String className) {
@@ -26,6 +26,11 @@ private ExtensionDescriptorBuilder(String id, String description, String classNa
         this.className = className;
     }
 
+    public ExtensionDescriptorBuilder maxChildCount(int maxChildCount) {
+        this.maxChildCount = maxChildCount;
+        return this;
+    }
+
     public ExtensionDescriptorBuilder attribute(String name, String type, String description) {
         attributeTypes.put(name, type);
         attributeDescriptions.put(name, description);
@@ -53,7 +58,7 @@ public int getMaxChildCount() {
             @Override
             public List<Attribute> getAttributes() {
 
-                List<Attribute> result = new ArrayList<>();
+                List<Attribute> result = new ArrayList<Attribute>();
 
                 for (final Map.Entry<String, String> descriptionEntry : attributeDescriptions.entrySet()) {
                     result.add(new Attribute() {
diff --git a/coreserver/src/main/java/ai/labs/core/bootstrap/CoreModule.java b/coreserver/src/main/java/ai/labs/core/bootstrap/CoreModule.java
index c7d56312d..cc9be7015 100644
--- a/coreserver/src/main/java/ai/labs/core/bootstrap/CoreModule.java
+++ b/coreserver/src/main/java/ai/labs/core/bootstrap/CoreModule.java
@@ -1,10 +1,11 @@
 package ai.labs.core.bootstrap;
 
 import ai.labs.core.CoreRuntime;
-import ai.labs.core.behavior.BehaviorDeserialization;
 import ai.labs.core.behavior.BehaviorRulesEvaluationTask;
-import ai.labs.core.behavior.IBehaviorDeserialization;
+import ai.labs.core.behavior.BehaviorSerialization;
+import ai.labs.core.behavior.IBehaviorSerialization;
 import ai.labs.core.normalizing.NormalizeInputTask;
+import ai.labs.core.output.SimpleOutputTask;
 import ai.labs.core.rest.internal.RestBotAdministration;
 import ai.labs.core.rest.internal.RestBotEngine;
 import ai.labs.lifecycle.ILifecycleTask;
@@ -27,16 +28,19 @@ public CoreModule(InputStream... inputStream) {
     protected void configure() {
         registerConfigFiles(configFiles);
 
-        bind(IBehaviorDeserialization.class).to(BehaviorDeserialization.class).in(Scopes.SINGLETON);
+        bind(IBehaviorSerialization.class).to(BehaviorSerialization.class).in(Scopes.SINGLETON);
 
         bind(IRestBotEngine.class).to(RestBotEngine.class);
         bind(IRestBotAdministration.class).to(RestBotAdministration.class);
         bind(IConversationCoordinator.class).to(ConversationCoordinator.class).in(Scopes.SINGLETON);
+        /*bind(IRestBotUI.class).to(RestBotUI.class);
+        bind(IRestBotmarklet.class).to(RestBotmarklet.class);*/
 
         MapBinder<String, ILifecycleTask> lifecycleTaskPlugins
                 = MapBinder.newMapBinder(binder(), String.class, ILifecycleTask.class);
         lifecycleTaskPlugins.addBinding("ai.labs.normalizer").to(NormalizeInputTask.class);
         lifecycleTaskPlugins.addBinding("ai.labs.behavior").to(BehaviorRulesEvaluationTask.class);
+        lifecycleTaskPlugins.addBinding("ai.labs.output").to(SimpleOutputTask.class);
 
         bind(CoreRuntime.class).asEagerSingleton();
     }
diff --git a/coreserver/src/main/java/ai/labs/core/normalizing/NormalizeInputTask.java b/coreserver/src/main/java/ai/labs/core/normalizing/NormalizeInputTask.java
index abb4c9958..a73fc3099 100644
--- a/coreserver/src/main/java/ai/labs/core/normalizing/NormalizeInputTask.java
+++ b/coreserver/src/main/java/ai/labs/core/normalizing/NormalizeInputTask.java
@@ -1,5 +1,6 @@
 package ai.labs.core.normalizing;
 
+import ai.labs.lifecycle.AbstractLifecycleTask;
 import ai.labs.lifecycle.ILifecycleTask;
 import ai.labs.memory.Data;
 import ai.labs.memory.IConversationMemory;
@@ -13,7 +14,7 @@
  * @author ginccc
  */
 @Singleton
-public class NormalizeInputTask implements ILifecycleTask {
+public class NormalizeInputTask extends AbstractLifecycleTask implements ILifecycleTask {
     private InputNormalizer normalizer;
 
     public NormalizeInputTask() {
@@ -45,12 +46,12 @@ public List<String> getOutputDependencies() {
 
     @Override
     public void executeTask(IConversationMemory memory) {
-        IData<String> latestInput = memory.getCurrentStep().getLatestData("input");
+        IData latestInput = memory.getCurrentStep().getLatestData("input");
         if (latestInput == null) {
             return;
         }
-        String input = latestInput.getResult();
+        String input = (String) latestInput.getResult();
         String formattedInput = normalizer.normalizeInput(input);
-        memory.getCurrentStep().storeData(new Data<>("input:formatted", formattedInput));
+        memory.getCurrentStep().storeData(new Data("input:formatted", formattedInput));
     }
 }
diff --git a/outputgeneration-definition/src/main/java/ai/labs/output/IOutputFilter.java b/coreserver/src/main/java/ai/labs/core/output/IOutputFilter.java
similarity index 78%
rename from outputgeneration-definition/src/main/java/ai/labs/output/IOutputFilter.java
rename to coreserver/src/main/java/ai/labs/core/output/IOutputFilter.java
index ae65d432a..8f48fa4a6 100644
--- a/outputgeneration-definition/src/main/java/ai/labs/output/IOutputFilter.java
+++ b/coreserver/src/main/java/ai/labs/core/output/IOutputFilter.java
@@ -1,4 +1,4 @@
-package ai.labs.output;
+package ai.labs.core.output;
 
 /**
  * @author ginccc
diff --git a/outputgeneration-definition/src/main/java/ai/labs/output/ISimpleOutput.java b/coreserver/src/main/java/ai/labs/core/output/ISimpleOutput.java
similarity index 76%
rename from outputgeneration-definition/src/main/java/ai/labs/output/ISimpleOutput.java
rename to coreserver/src/main/java/ai/labs/core/output/ISimpleOutput.java
index cf25a6c40..5cde0ea29 100644
--- a/outputgeneration-definition/src/main/java/ai/labs/output/ISimpleOutput.java
+++ b/coreserver/src/main/java/ai/labs/core/output/ISimpleOutput.java
@@ -1,6 +1,4 @@
-package ai.labs.output;
-
-import ai.labs.output.model.OutputEntry;
+package ai.labs.core.output;
 
 import java.util.List;
 
diff --git a/outputgeneration-definition/src/main/java/ai/labs/output/model/OutputEntry.java b/coreserver/src/main/java/ai/labs/core/output/OutputEntry.java
similarity index 60%
rename from outputgeneration-definition/src/main/java/ai/labs/output/model/OutputEntry.java
rename to coreserver/src/main/java/ai/labs/core/output/OutputEntry.java
index d8d105461..43a4d8184 100644
--- a/outputgeneration-definition/src/main/java/ai/labs/output/model/OutputEntry.java
+++ b/coreserver/src/main/java/ai/labs/core/output/OutputEntry.java
@@ -1,10 +1,7 @@
-package ai.labs.output.model;
+package ai.labs.core.output;
 
-import ai.labs.expressions.Expression;
 import lombok.*;
 
-import java.util.List;
-
 /**
  * @author ginccc
  */
@@ -18,18 +15,10 @@
 public class OutputEntry implements Comparable<OutputEntry> {
     private String key;
     private String text;
-    private List<QuickReply> quickReplies;
     private int occurrence;
 
     @Override
     public int compareTo(OutputEntry o) {
         return occurrence < o.occurrence ? -1 : (occurrence == o.occurrence ? 0 : 1);
     }
-
-    @Getter
-    @Setter
-    public static class QuickReply {
-        private String value;
-        private List<Expression> expressions;
-    }
 }
diff --git a/outputgeneration-impl/src/main/java/ai/labs/output/impl/OutputFilter.java b/coreserver/src/main/java/ai/labs/core/output/OutputFilter.java
similarity index 76%
rename from outputgeneration-impl/src/main/java/ai/labs/output/impl/OutputFilter.java
rename to coreserver/src/main/java/ai/labs/core/output/OutputFilter.java
index 3e6d5a9c4..db77aed76 100644
--- a/outputgeneration-impl/src/main/java/ai/labs/output/impl/OutputFilter.java
+++ b/coreserver/src/main/java/ai/labs/core/output/OutputFilter.java
@@ -1,6 +1,5 @@
-package ai.labs.output.impl;
+package ai.labs.core.output;
 
-import ai.labs.output.IOutputFilter;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
diff --git a/outputgeneration-impl/src/main/java/ai/labs/output/impl/SimpleOutput.java b/coreserver/src/main/java/ai/labs/core/output/SimpleOutput.java
similarity index 92%
rename from outputgeneration-impl/src/main/java/ai/labs/output/impl/SimpleOutput.java
rename to coreserver/src/main/java/ai/labs/core/output/SimpleOutput.java
index 3a30fe7e4..d4282f0a5 100644
--- a/outputgeneration-impl/src/main/java/ai/labs/output/impl/SimpleOutput.java
+++ b/coreserver/src/main/java/ai/labs/core/output/SimpleOutput.java
@@ -1,8 +1,4 @@
-package ai.labs.output.impl;
-
-import ai.labs.output.IOutputFilter;
-import ai.labs.output.ISimpleOutput;
-import ai.labs.output.model.OutputEntry;
+package ai.labs.core.output;
 
 import java.util.*;
 
@@ -51,6 +47,15 @@ public List<List<OutputEntry>> getOutputs(List<IOutputFilter> outputFilter) {
         return outputs;
     }
 
+    public List<String> convert(List<OutputEntry> outputEntries) {
+        List<String> ret = new LinkedList<>();
+        for (OutputEntry outputEntry : outputEntries) {
+            ret.add(outputEntry.getText());
+        }
+
+        return ret;
+    }
+
     private List<OutputEntry> extractOutputEntryOfSameOccurrence(List<OutputEntry> outputEntries, int occurrence) {
         int highestOccurrence = -1;
         for (OutputEntry outputEntry : outputEntries) {
@@ -75,13 +80,4 @@ private List<OutputEntry> extractOutputEntryOfSameOccurrence(List<OutputEntry> o
 
         return outputEntries;
     }
-
-    List<String> convertOutputText(List<OutputEntry> outputEntries) {
-        List<String> ret = new LinkedList<>();
-        for (OutputEntry outputEntry : outputEntries) {
-            ret.add(outputEntry.getText());
-        }
-
-        return ret;
-    }
 }
diff --git a/outputgeneration-impl/src/main/java/ai/labs/output/impl/SimpleOutputTask.java b/coreserver/src/main/java/ai/labs/core/output/SimpleOutputTask.java
similarity index 55%
rename from outputgeneration-impl/src/main/java/ai/labs/output/impl/SimpleOutputTask.java
rename to coreserver/src/main/java/ai/labs/core/output/SimpleOutputTask.java
index 6a6987b34..2502dfd30 100644
--- a/outputgeneration-impl/src/main/java/ai/labs/output/impl/SimpleOutputTask.java
+++ b/coreserver/src/main/java/ai/labs/core/output/SimpleOutputTask.java
@@ -1,15 +1,12 @@
-package ai.labs.output.impl;
+package ai.labs.core.output;
 
-import ai.labs.expressions.utilities.IExpressionProvider;
+import ai.labs.lifecycle.AbstractLifecycleTask;
 import ai.labs.lifecycle.ILifecycleTask;
 import ai.labs.lifecycle.LifecycleException;
 import ai.labs.lifecycle.PackageConfigurationException;
+import ai.labs.memory.Data;
 import ai.labs.memory.IConversationMemory;
 import ai.labs.memory.IData;
-import ai.labs.memory.IDataFactory;
-import ai.labs.output.IOutputFilter;
-import ai.labs.output.IQuickReply;
-import ai.labs.output.model.OutputEntry;
 import ai.labs.resources.rest.output.model.OutputConfiguration;
 import ai.labs.resources.rest.output.model.OutputConfigurationSet;
 import ai.labs.runtime.client.configuration.IResourceClientLibrary;
@@ -18,35 +15,27 @@
 
 import javax.inject.Inject;
 import java.net.URI;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ginccc
  */
-public class SimpleOutputTask implements ILifecycleTask {
+public class SimpleOutputTask extends AbstractLifecycleTask implements ILifecycleTask {
     private static final String SEPARATOR = " ";
     private static final String ACTION_KEY = "action";
     private SimpleOutput simpleOutput;
     private IResourceClientLibrary resourceClientLibrary;
-    private final IDataFactory dataFactory;
-    private final IExpressionProvider expressionProvider;
 
     @Inject
-    public SimpleOutputTask(IResourceClientLibrary resourceClientLibrary,
-                            IDataFactory dataFactory,
-                            IExpressionProvider expressionProvider) {
+    public SimpleOutputTask(IResourceClientLibrary resourceClientLibrary) {
         this.resourceClientLibrary = resourceClientLibrary;
-        this.dataFactory = dataFactory;
-        this.expressionProvider = expressionProvider;
         this.simpleOutput = new SimpleOutput();
 
     }
 
-    @Override
-    public void init() {
-        // not implemented
-    }
-
     @Override
     public String getId() {
         return "ai.labs.output.SimpleOutput";
@@ -70,11 +59,11 @@ public List<String> getOutputDependencies() {
     @Override
     public void executeTask(IConversationMemory memory) throws LifecycleException {
         List<IOutputFilter> outputFilters = new LinkedList<>();
-        IData<List<String>> latestData = memory.getCurrentStep().getLatestData(ACTION_KEY);
+        IData latestData = memory.getCurrentStep().getLatestData(ACTION_KEY);
         if (latestData == null) {
             return;
         }
-        List<String> actions = latestData.getResult();
+        List<String> actions = (List<String>) latestData.getResult();
         for (String action : actions) {
             int occurrence = countActionOccurrence(memory.getPreviousSteps(), action);
             outputFilters.add(new OutputFilter(action, occurrence));
@@ -87,21 +76,11 @@ public void executeTask(IConversationMemory memory) throws LifecycleException {
         }
 
         for (List<OutputEntry> possibleOutput : possibleOutputs) {
-            String outputTextKey = "output:action:" + possibleOutput.get(0).getKey();
-            IData outputText = dataFactory.createData(outputTextKey, null,
-                    simpleOutput.convertOutputText(possibleOutput));
-            memory.getCurrentStep().storeData(outputText);
-
-            String outputQuickReplyKey = "output:quickreply:" + possibleOutput.get(0).getKey();
-            List<IQuickReply> quickReplies = convertQuickReplies(possibleOutput);
-            if (!quickReplies.isEmpty()) {
-                IData outputQuickReplies = dataFactory.createData(outputQuickReplyKey, quickReplies);
-                outputQuickReplies.setPublic(true);
-                memory.getCurrentStep().storeData(outputQuickReplies);
-            }
+            String key = "output:action:" + possibleOutput.get(0).getKey();
+            memory.getCurrentStep().storeData(new Data(key, null, simpleOutput.convert(possibleOutput)));
         }
 
-        List<IData<String>> allOutputParts = memory.getCurrentStep().getAllData("output:action");
+        List<IData> allOutputParts = memory.getCurrentStep().getAllData("output:action");
         StringBuilder finalOutput = new StringBuilder();
         for (IData outputPart : allOutputParts) {
             finalOutput.append(outputPart.getResult()).append(SEPARATOR);
@@ -111,7 +90,7 @@ public void executeTask(IConversationMemory memory) throws LifecycleException {
             finalOutput.delete(finalOutput.length() - SEPARATOR.length(), finalOutput.length());
         }
 
-        IData finalOutputData = dataFactory.createData("output:final", finalOutput.toString());
+        Data finalOutputData = new Data("output:final", finalOutput.toString());
         finalOutputData.setPublic(true);
         memory.getCurrentStep().storeData(finalOutputData);
     }
@@ -121,9 +100,9 @@ private int countActionOccurrence(IConversationMemory.IConversationStepStack con
         int count = 0;
         for (int i = 0; i < conversationStepStack.size(); i++) {
             IConversationMemory.IConversationStep conversationStep = conversationStepStack.get(i);
-            IData<List<String>> actionsData = conversationStep.getLatestData(ACTION_KEY);
+            IData actionsData = conversationStep.getLatestData(ACTION_KEY);
             if (actionsData != null) {
-                List<String> actions = actionsData.getResult();
+                List<String> actions = (List<String>) actionsData.getResult();
                 if (actions.contains(action)) {
                     count++;
                 }
@@ -143,42 +122,14 @@ public void configure(Map<String, Object> configuration) throws PackageConfigura
 
             for (OutputConfiguration outputConfiguration : outputConfigurationSet.getOutputs()) {
                 String key = outputConfiguration.getKey();
-                List<OutputConfiguration.QuickReply> configQuickReplies = outputConfiguration.getQuickReplies();
-                List<OutputEntry.QuickReply> quickReplies = convert(configQuickReplies);
-
                 int occurrence = outputConfiguration.getOccurrence();
                 outputConfiguration.getOutputValues().stream().filter(
                         text -> !RuntimeUtilities.isNullOrEmpty(text)).forEachOrdered(
-                        text -> simpleOutput.addOutputEntry(new OutputEntry(key, text, quickReplies, occurrence)));
+                        text -> simpleOutput.addOutputEntry(new OutputEntry(key, text, occurrence)));
             }
         } catch (ServiceException e) {
             String message = "Error while fetching OutputConfigurationSet!\n" + e.getLocalizedMessage();
             throw new PackageConfigurationException(message, e);
         }
     }
-
-    private List<OutputEntry.QuickReply> convert(List<OutputConfiguration.QuickReply> configQuickReplies) {
-        List<OutputEntry.QuickReply> quickReplies = new ArrayList<>();
-
-        for (OutputConfiguration.QuickReply configQuickReply : configQuickReplies) {
-            OutputEntry.QuickReply quickReply = new OutputEntry.QuickReply();
-            quickReply.setValue(configQuickReply.getValue());
-            quickReply.setExpressions(expressionProvider.parseExpressions(configQuickReply.getExpressions()));
-            quickReplies.add(quickReply);
-        }
-
-        return quickReplies;
-    }
-
-    private List<IQuickReply> convertQuickReplies(List<OutputEntry> possibleOutput) {
-        List<IQuickReply> ret = new LinkedList<>();
-        for (OutputEntry outputEntry : possibleOutput) {
-            for (OutputEntry.QuickReply quickReply : outputEntry.getQuickReplies()) {
-                ret.add(new QuickReply(quickReply.getValue(), expressionProvider.toString(quickReply.getExpressions())));
-            }
-        }
-
-        return ret;
-    }
-
 }
diff --git a/coreserver/src/main/java/ai/labs/core/rest/internal/RestBotEngine.java b/coreserver/src/main/java/ai/labs/core/rest/internal/RestBotEngine.java
index 9c0fb5159..098cb5cdd 100644
--- a/coreserver/src/main/java/ai/labs/core/rest/internal/RestBotEngine.java
+++ b/coreserver/src/main/java/ai/labs/core/rest/internal/RestBotEngine.java
@@ -2,6 +2,7 @@
 
 import ai.labs.lifecycle.IConversation;
 import ai.labs.lifecycle.LifecycleException;
+import ai.labs.memory.ConversationMemoryUtilities;
 import ai.labs.memory.IConversationMemory;
 import ai.labs.memory.IConversationMemoryStore;
 import ai.labs.memory.model.ConversationMemorySnapshot;
@@ -29,8 +30,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
-import static ai.labs.memory.ConversationMemoryUtilities.*;
-
 /**
  * @author ginccc
  */
@@ -89,7 +88,7 @@ public SimpleConversationMemorySnapshot readConversation(Deployment.Environment
                 message = String.format(message, conversationId, botId);
                 throw new IllegalAccessException(message);
             }
-            return convertSimpleConversationMemory(conversationMemorySnapshot, includeAll);
+            return ConversationMemoryUtilities.convertSimpleConversationMemory(conversationMemorySnapshot, includeAll);
         } catch (IResourceStore.ResourceStoreException | IllegalAccessException e) {
             log.error(e.getLocalizedMessage(), e);
             throw new InternalServerErrorException(e.getLocalizedMessage(), e);
@@ -145,8 +144,10 @@ public void say(final Deployment.Environment environment,
             }
             final IConversation conversation = bot.continueConversation(conversationMemory,
                     conversationStep -> {
-                        SimpleConversationMemorySnapshot memorySnapshot = convertSimpleConversationMemory(
-                                convertConversationMemory(conversationMemory), true);
+                        SimpleConversationMemorySnapshot memorySnapshot = ConversationMemoryUtilities.
+                                convertSimpleConversationMemory(
+                                        (ConversationMemorySnapshot) conversationMemory, true);
+
                         response.resume(memorySnapshot);
                     });
 
@@ -328,7 +329,7 @@ public Response redo(final Deployment.Environment environment, String botId, fin
 
     private IConversationMemory loadConversationMemory(String conversationId) throws IResourceStore.ResourceStoreException, IResourceStore.ResourceNotFoundException {
         ConversationMemorySnapshot conversationMemorySnapshot = conversationMemoryStore.loadConversationMemorySnapshot(conversationId);
-        return convertConversationMemorySnapshot(conversationMemorySnapshot);
+        return ConversationMemoryUtilities.convertConversationMemorySnapshot(conversationMemorySnapshot);
     }
 
     private void setConversationState(String conversationId, ConversationState conversationState) {
@@ -336,7 +337,7 @@ private void setConversationState(String conversationId, ConversationState conve
     }
 
     private String storeConversationMemory(IConversationMemory conversationMemory, Deployment.Environment environment) throws IResourceStore.ResourceStoreException {
-        ConversationMemorySnapshot memorySnapshot = convertConversationMemory(conversationMemory);
+        ConversationMemorySnapshot memorySnapshot = ConversationMemoryUtilities.convertConversationMemory(conversationMemory);
         memorySnapshot.setEnvironment(environment);
         return conversationMemoryStore.storeConversationMemorySnapshot(memorySnapshot);
     }
diff --git a/coreserver/src/test/java/ai/labs/core/behavior/DeseralizeJsonBehaviorRulesTest.java b/coreserver/src/test/java/ai/labs/core/behavior/DeseralizeJsonBehaviorRulesTest.java
index 66b96df42..056231e72 100644
--- a/coreserver/src/test/java/ai/labs/core/behavior/DeseralizeJsonBehaviorRulesTest.java
+++ b/coreserver/src/test/java/ai/labs/core/behavior/DeseralizeJsonBehaviorRulesTest.java
@@ -15,7 +15,7 @@ public void testInputMatcher() throws IOException, DeserializationException {
 
         // test
         createInputMatcherDummy();
-        BehaviorSet result = BehaviorDeserialization.deserialize(jsonString);
+        BehaviorSet result = BehaviorSerialization.deserialize(jsonString);
 
         // assert
         BehaviorRule resultBehaviorRule = result.getBehaviorGroups().get(0).getBehaviorRules().get(0);
@@ -36,7 +36,7 @@ public void testOccurence() throws IOException, DeserializationException {
 
         // test
         createOccurenceDummy();
-        BehaviorSet result = BehaviorDeserialization.deserialize(jsonString);
+        BehaviorSet result = BehaviorSerialization.deserialize(jsonString);
 
         // assert
         BehaviorRule resultBehaviorRule = result.getBehaviorGroups().get(0).getBehaviorRules().get(0);
diff --git a/coreserver/src/test/java/ai/labs/core/behavior/SerializeJsonBehaviorRulesTest.java b/coreserver/src/test/java/ai/labs/core/behavior/SerializeJsonBehaviorRulesTest.java
index 48075157c..53eab594b 100644
--- a/coreserver/src/test/java/ai/labs/core/behavior/SerializeJsonBehaviorRulesTest.java
+++ b/coreserver/src/test/java/ai/labs/core/behavior/SerializeJsonBehaviorRulesTest.java
@@ -150,7 +150,7 @@ public void testInputMatcher() throws IOException {
         behaviorGroup.getBehaviorRules().add(behaviorRule);
 
         // test
-        String result = BehaviorDeserialization.serialize(behaviorSet);
+        String result = BehaviorSerialization.serialize(behaviorSet);
 
         // assert
         Assert.assertEquals("{\"behaviorGroups\":[{\"name\":null,\"behaviorRules\":[{\"name\":\"rule1\",\"actions\":[],\"children\":[{\"type\":\"inputmatcher\",\"values\":{\"expressions\":\"predicate(value1, value2)\"},\"children\":[]}]}]}]}", result);
@@ -169,7 +169,7 @@ public void testPropertyMatcher() throws IOException {
         behaviorGroup.getBehaviorRules().add(behaviorRule);
 
         //test
-        String result = BehaviorDeserialization.serialize(behaviorSet);
+        String result = BehaviorSerialization.serialize(behaviorSet);
 
         //assert
         Assert.assertEquals("{\"behaviorGroups\":[{\"name\":null,\"behaviorRules\":[{\"name\":\"rule1\",\"actions\":[],\"children\":[{\"type\":\"propertymatcher\",\"values\":{\"expressions\":\"test\"},\"children\":[]}]}]}]}", result);
@@ -187,7 +187,7 @@ public void testDependency() throws IOException {
         behaviorGroup.getBehaviorRules().add(behaviorRule);
 
         // test
-        String result = BehaviorDeserialization.serialize(behaviorSet);
+        String result = BehaviorSerialization.serialize(behaviorSet);
 
         // assert
         Assert.assertEquals("{\"behaviorGroups\":[{\"name\":null,\"behaviorRules\":[{\"name\":\"rule1\",\"actions\":[],\"children\":[{\"type\":\"dependency\",\"values\":{\"reference\":\"referenceName\"},\"children\":[]}]}]}]}", result);
@@ -207,7 +207,7 @@ public void testOccurrence() throws IOException {
         behaviorGroup.getBehaviorRules().add(behaviorRule);
 
         //test
-        String result = BehaviorDeserialization.serialize(behaviorSet);
+        String result = BehaviorSerialization.serialize(behaviorSet);
 
         //assert
         Assert.assertEquals("{\"behaviorGroups\":[{\"name\":null,\"behaviorRules\":[{\"name\":\"rule1\",\"actions\":[],\"children\":[{\"type\":\"occurrence\",\"values\":{\"behaviorRuleName\":\"test1\",\"maxOccurrence\":\"1\"},\"children\":[]}]}]}]}", result);
@@ -228,7 +228,7 @@ public void testConnector() throws IOException {
         behaviorGroup.getBehaviorRules().add(behaviorRule);
 
         //test
-        String result = BehaviorDeserialization.serialize(behaviorSet);
+        String result = BehaviorSerialization.serialize(behaviorSet);
 
         //assert
         Assert.assertEquals("{\"behaviorGroups\":[{\"name\":null,\"behaviorRules\":[{\"name\":\"rule1\",\"actions\":[],\"children\":[{\"type\":\"connector\",\"values\":{\"operator\":\"AND\"},\"children\":[{\"type\":\"occurrence\",\"values\":{\"behaviorRuleName\":null,\"maxOccurrence\":\"1\"},\"children\":[]},{\"type\":\"occurrence\",\"values\":{\"behaviorRuleName\":null,\"maxOccurrence\":\"1\"},\"children\":[]}]}]}]}]}", result);
@@ -250,7 +250,7 @@ public void testNegation() throws IOException {
         behaviorGroup.getBehaviorRules().add(behaviorRule);
 
         //test
-        String result = BehaviorDeserialization.serialize(behaviorSet);
+        String result = BehaviorSerialization.serialize(behaviorSet);
 
         //assert
         Assert.assertEquals("{\"behaviorGroups\":[{\"name\":null,\"behaviorRules\":[{\"name\":\"rule1\",\"actions\":[],\"children\":[{\"type\":\"negation\",\"values\":{},\"children\":[{\"type\":\"occurrence\",\"values\":{\"behaviorRuleName\":\"rule2\",\"maxOccurrence\":\"1\"},\"children\":[]}]}]}]}]}", result);
@@ -272,7 +272,7 @@ public void testResultSize() throws IOException {
         behaviorGroup.getBehaviorRules().add(behaviorRule);
 
         //test
-        String result = BehaviorDeserialization.serialize(behaviorSet);
+        String result = BehaviorSerialization.serialize(behaviorSet);
 
         //assert
         Assert.assertEquals("{\"behaviorGroups\":[{\"name\":null,\"behaviorRules\":[{\"name\":\"rule1\",\"actions\":[],\"children\":[{\"type\":\"resultSize\",\"values\":{\"equal\":\"1\",\"min\":\"3\",\"max\":\"2\"},\"children\":[]}]}]}]}", result);
@@ -291,7 +291,7 @@ public void testOutputReference() throws IOException {
         behaviorGroup.getBehaviorRules().add(behaviorRule);
 
         //test
-        String result = BehaviorDeserialization.serialize(behaviorSet);
+        String result = BehaviorSerialization.serialize(behaviorSet);
 
         //assert
         Assert.assertEquals("{\"behaviorGroups\":[{\"name\":null,\"behaviorRules\":[{\"name\":\"rule1\",\"actions\":[],\"children\":[{\"type\":\"outputReference\",\"values\":{\"filter\":\"test\",\"inputValue\":\"inputValue\",\"sessionValue\":\"sessionValue\"},\"children\":[]}]}]}]}", result);
diff --git a/coreserver/src/test/java/ai/labs/core/output/OutputSerializationTest.java b/coreserver/src/test/java/ai/labs/core/output/OutputSerializationTest.java
new file mode 100644
index 000000000..695c85587
--- /dev/null
+++ b/coreserver/src/test/java/ai/labs/core/output/OutputSerializationTest.java
@@ -0,0 +1,47 @@
+package ai.labs.core.output;
+
+import ai.labs.serialization.IJsonSerialization;
+import ai.labs.serialization.JsonSerialization;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import junit.framework.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author ginccc
+ */
+public class OutputSerializationTest {
+
+    private final String jsonTestString = "{\"key\":\"key\",\"text\":\"value\",\"occurrence\":0}";
+    private IJsonSerialization jsonSerialization;
+
+    @Before
+    public void setUp() throws Exception {
+        jsonSerialization = new JsonSerialization(new ObjectMapper());
+    }
+
+    @Test
+    public void testSerialize() throws Exception {
+        //setup
+        OutputEntry outputEntry = new OutputEntry("key", "value", 0);
+
+        //test
+        String result = jsonSerialization.serialize(outputEntry);
+
+        //assert
+        Assert.assertEquals(jsonTestString, result);
+    }
+
+    @Test
+    public void testDeserialize() throws Exception {
+        //setup
+        OutputEntry outputEntry = new OutputEntry("key", "value", 0);
+
+
+        //test
+        OutputEntry result = jsonSerialization.deserialize(jsonTestString, OutputEntry.class);
+
+        //assert
+        Assert.assertEquals(outputEntry, result);
+    }
+}
diff --git a/outputgeneration-impl/src/test/java/ai/labs/output/impl/SimpleOutputTest.java b/coreserver/src/test/java/ai/labs/core/output/SimpleOutputTest.java
similarity index 89%
rename from outputgeneration-impl/src/test/java/ai/labs/output/impl/SimpleOutputTest.java
rename to coreserver/src/test/java/ai/labs/core/output/SimpleOutputTest.java
index 022b9cb23..09b7087ed 100644
--- a/outputgeneration-impl/src/test/java/ai/labs/output/impl/SimpleOutputTest.java
+++ b/coreserver/src/test/java/ai/labs/core/output/SimpleOutputTest.java
@@ -1,7 +1,5 @@
-package ai.labs.output.impl;
+package ai.labs.core.output;
 
-import ai.labs.output.IOutputFilter;
-import ai.labs.output.model.OutputEntry;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -16,7 +14,7 @@ public class SimpleOutputTest {
     public void testGetOutputOccurrence0() throws Exception {
         //setup
         SimpleOutput simpleOutput = new SimpleOutput();
-        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Hallo!", null, 0));
+        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Hallo!", 0));
 
         //test
         List<List<OutputEntry>> outputs = simpleOutput.getOutputs(Arrays.asList(new IOutputFilter[]{new OutputFilter("greeting", 0)}));
@@ -29,8 +27,8 @@ public void testGetOutputOccurrence0() throws Exception {
     public void testGetOutputOccurrence0_1() throws Exception {
         //setup
         SimpleOutput simpleOutput = new SimpleOutput();
-        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Hallo!", null,  0));
-        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Hallo", null, 0));
+        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Hallo!", 0));
+        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Hallo", 0));
 
         //test
         List<List<OutputEntry>> outputs = simpleOutput.getOutputs(Arrays.asList(new IOutputFilter[]{new OutputFilter("greeting", 0)}));
@@ -44,8 +42,8 @@ public void testGetOutputOccurrence0_1() throws Exception {
     public void testGetOutputOccurrence1() throws Exception {
         //setup
         SimpleOutput simpleOutput = new SimpleOutput();
-        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Hallo!", null, 0));
-        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Second Hello!", null, 1));
+        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Hallo!", 0));
+        simpleOutput.addOutputEntry(new OutputEntry("greeting", "Second Hello!", 1));
 
         //test
         List<List<OutputEntry>> outputs1 = simpleOutput.getOutputs(Arrays.asList(new IOutputFilter[]{new OutputFilter("greeting", 0)}));
diff --git a/facebookmessenger-impl/src/main/java/ai/labs/facebookmessenger/endpoint/FacebookEndpoint.java b/facebookmessenger-impl/src/main/java/ai/labs/facebookmessenger/endpoint/FacebookEndpoint.java
index fb5dcbf82..21e1098f5 100644
--- a/facebookmessenger-impl/src/main/java/ai/labs/facebookmessenger/endpoint/FacebookEndpoint.java
+++ b/facebookmessenger-impl/src/main/java/ai/labs/facebookmessenger/endpoint/FacebookEndpoint.java
@@ -8,6 +8,7 @@
 import ai.labs.memory.model.SimpleConversationMemorySnapshot;
 import ai.labs.resources.rest.bots.IBotStore;
 import ai.labs.resources.rest.bots.model.BotConfiguration;
+import ai.labs.resources.rest.bots.model.ChannelConnector;
 import ai.labs.rest.rest.IRestBotEngine;
 import ai.labs.rest.restinterfaces.IRestInterfaceFactory;
 import ai.labs.runtime.SystemRuntime;
@@ -95,7 +96,7 @@ private MessengerClient createMessageClient(String botId) {
         String appSecret = null;
         String verificationToken = null;
         String pageAccessToken = null;
-        for (BotConfiguration.ChannelConnector channelConnector : botConfiguration.getChannels()) {
+        for (ChannelConnector channelConnector : botConfiguration.getChannels()) {
             if (channelConnector.getType().toString().equals(RESOURCE_URI_CHANNELCONNECTOR)) {
                 Map<String, String> channelConnectorConfig = channelConnector.getConfig();
                 appSecret = channelConnectorConfig.get("appSecret");
@@ -183,8 +184,8 @@ private void say(Deployment.Environment environment,
     private String extractOutput(SimpleConversationMemorySnapshot memorySnapshot) {
         for (SimpleConversationStep conversationStep : memorySnapshot.getConversationSteps()) {
             for (SimpleData simpleData : conversationStep.getData()) {
-                if (simpleData.getKey().startsWith("output:final")) {
-                    return simpleData.getValue().toString();
+                if (simpleData.getKey().startsWith("output")) {
+                    return simpleData.getValue();
                 }
             }
         }
diff --git a/outputgeneration-definition/pom.xml b/outputgeneration-definition/pom.xml
deleted file mode 100644
index ce2b86259..000000000
--- a/outputgeneration-definition/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>ai.labs</groupId>
-        <artifactId>eddi</artifactId>
-        <version>4.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <packaging>jar</packaging>
-    <artifactId>outputgeneration-definition</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>ai.labs</groupId>
-            <artifactId>expressions</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-</project>
\ No newline at end of file
diff --git a/outputgeneration-definition/src/main/java/ai/labs/output/IQuickReply.java b/outputgeneration-definition/src/main/java/ai/labs/output/IQuickReply.java
deleted file mode 100644
index 5eb45961d..000000000
--- a/outputgeneration-definition/src/main/java/ai/labs/output/IQuickReply.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package ai.labs.output;
-
-/**
- * @author ginccc
- */
-public interface IQuickReply {
-    String getValue();
-
-    String getExpressions();
-}
diff --git a/outputgeneration-impl/pom.xml b/outputgeneration-impl/pom.xml
deleted file mode 100644
index ced0845cb..000000000
--- a/outputgeneration-impl/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>ai.labs</groupId>
-        <artifactId>eddi</artifactId>
-        <version>4.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <packaging>jar</packaging>
-    <artifactId>outputgeneration-impl</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>ai.labs</groupId>
-            <artifactId>outputgeneration-definition</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ai.labs</groupId>
-            <artifactId>conversationlifecycle-definition</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ai.labs</groupId>
-            <artifactId>runtime-definition</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ai.labs</groupId>
-            <artifactId>sharedutilities</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-</project>
\ No newline at end of file
diff --git a/outputgeneration-impl/src/main/java/ai/labs/output/bootstrap/OutputGenerationModule.java b/outputgeneration-impl/src/main/java/ai/labs/output/bootstrap/OutputGenerationModule.java
deleted file mode 100644
index 3541469be..000000000
--- a/outputgeneration-impl/src/main/java/ai/labs/output/bootstrap/OutputGenerationModule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package ai.labs.output.bootstrap;
-
-import ai.labs.lifecycle.ILifecycleTask;
-import ai.labs.output.impl.SimpleOutputTask;
-import ai.labs.runtime.bootstrap.AbstractBaseModule;
-import com.google.inject.multibindings.MapBinder;
-
-/**
- * @author ginccc
- */
-public class OutputGenerationModule extends AbstractBaseModule {
-    @Override
-    protected void configure() {
-        MapBinder<String, ILifecycleTask> lifecycleTaskPlugins
-                = MapBinder.newMapBinder(binder(), String.class, ILifecycleTask.class);
-        lifecycleTaskPlugins.addBinding("ai.labs.output").to(SimpleOutputTask.class);
-    }
-}
diff --git a/outputgeneration-impl/src/main/java/ai/labs/output/impl/QuickReply.java b/outputgeneration-impl/src/main/java/ai/labs/output/impl/QuickReply.java
deleted file mode 100644
index 9d39dc0b3..000000000
--- a/outputgeneration-impl/src/main/java/ai/labs/output/impl/QuickReply.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ai.labs.output.impl;
-
-import ai.labs.output.IQuickReply;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author ginccc
- */
-@AllArgsConstructor
-@Getter
-@Setter
-public class QuickReply implements IQuickReply {
-    private String value;
-    private String expressions;
-}
diff --git a/outputgeneration-impl/src/test/java/ai/labs/output/impl/OutputSerializationTest.java b/outputgeneration-impl/src/test/java/ai/labs/output/impl/OutputSerializationTest.java
deleted file mode 100644
index ffb9cfacf..000000000
--- a/outputgeneration-impl/src/test/java/ai/labs/output/impl/OutputSerializationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package ai.labs.output.impl;
-
-import ai.labs.resources.rest.output.model.OutputConfiguration;
-import ai.labs.resources.rest.output.model.OutputConfigurationSet;
-import ai.labs.serialization.IJsonSerialization;
-import ai.labs.serialization.JsonSerialization;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import junit.framework.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-
-/**
- * @author ginccc
- */
-public class OutputSerializationTest {
-
-    private final String jsonTestString = "{\"outputs\":[{\"key\":\"key\",\"outputValues\":[\"value\"],\"quickReplies\":[{\"value\":\"quickReply\",\"expressions\":\"exp(quickReply)\"}],\"occurrence\":0}]}";
-    private IJsonSerialization jsonSerialization;
-    private OutputConfigurationSet outputConfigurationSet;
-
-    @Before
-    public void setUp() throws Exception {
-        jsonSerialization = new JsonSerialization(new ObjectMapper());
-
-        //setup test data
-        outputConfigurationSet = new OutputConfigurationSet();
-        OutputConfiguration.QuickReply quickReply = new OutputConfiguration.QuickReply();
-        quickReply.setValue("quickReply");
-        quickReply.setExpressions("exp(quickReply)");
-        OutputConfiguration outputConfiguration = new OutputConfiguration("key", 0,
-                Collections.singletonList("value"), Collections.singletonList(quickReply));
-        outputConfigurationSet.setOutputs(Collections.singletonList(outputConfiguration));
-    }
-
-    @Test
-    public void testSerialize() throws Exception {
-        //test
-        String result = jsonSerialization.serialize(outputConfigurationSet);
-
-        //assert
-        Assert.assertEquals(jsonTestString, result);
-    }
-
-    @Test
-    public void testDeserialize() throws Exception {
-        //test
-        OutputConfigurationSet result = jsonSerialization.deserialize(jsonTestString, OutputConfigurationSet.class);
-
-        //assert
-        Assert.assertEquals(outputConfigurationSet, result);
-    }
-}
diff --git a/pom.xml b/pom.xml
index 6b87ddabb..3f476c529 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,6 @@
         <module>httpclient-impl-jetty</module>
         <module>facebookmessenger-definition</module>
         <module>facebookmessenger-impl</module>
-        <module>outputgeneration-definition</module>
-        <module>outputgeneration-impl</module>
     </modules>
 
     <build>
diff --git a/runtime-impl/src/main/java/ai/labs/runtime/BaseRuntime.java b/runtime-impl/src/main/java/ai/labs/runtime/BaseRuntime.java
index fa7b57fb5..bc3c65be8 100644
--- a/runtime-impl/src/main/java/ai/labs/runtime/BaseRuntime.java
+++ b/runtime-impl/src/main/java/ai/labs/runtime/BaseRuntime.java
@@ -9,10 +9,7 @@
 import javax.inject.Named;
 import java.io.File;
 import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 /**
  * @author ginccc
@@ -44,19 +41,17 @@ public BaseRuntime(ExecutorService executorService,
 
     public void init() {
         if (!isInit) {
-            initLogging();
             if (projectName == null || projectName.isEmpty()) {
-                log.error("ProjectName should be defined in systemRuntime.properties as 'systemRuntime.projectName'");
-            } else {
-                initProjectName(projectName);
+                throw new RuntimeException("ProjectName cannot be null nor empty.");
             }
-
+            initProjectName(projectName);
+            initLogging();
             logVersion();
             initExecutorServiceShutdownHook();
             SystemRuntime.setRuntime(this);
             isInit = true;
         } else {
-            log.warn("SystemRuntime has already been initialized!");
+            throw new RuntimeException("SystemRuntime has already been initialized!");
         }
     }
 
@@ -69,7 +64,7 @@ public void logVersion() {
         log.info(projectName + " v" + getVersion());
     }
 
-    private void initLogging() {
+    protected void initLogging() {
         System.setProperty("systemRuntime.logDir", getLogDir());
         Configurator.initialize("Logging", null, new File(getConfigDir() + lowerCaseFirstLetter(projectName) + ".log4j.xml").toURI());
         log = LoggerFactory.getLogger(BaseRuntime.class);
diff --git a/semanticparser-definition/src/main/java/ai/labs/parser/rest/model/Solution.java b/semanticparser-definition/src/main/java/ai/labs/parser/rest/model/Solution.java
index 0a45b9113..66b773d23 100644
--- a/semanticparser-definition/src/main/java/ai/labs/parser/rest/model/Solution.java
+++ b/semanticparser-definition/src/main/java/ai/labs/parser/rest/model/Solution.java
@@ -1,6 +1,8 @@
 package ai.labs.parser.rest.model;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @author ginccc
@@ -9,8 +11,6 @@
 @Setter
 @Getter
 @AllArgsConstructor
-@EqualsAndHashCode
-@ToString
 public class Solution {
     private String expressions;
 }
diff --git a/semanticparser-impl/pom.xml b/semanticparser-impl/pom.xml
index 061e8ceeb..a1309d60f 100644
--- a/semanticparser-impl/pom.xml
+++ b/semanticparser-impl/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>conversationmemory-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>ai.labs</groupId>
-            <artifactId>outputgeneration-definition</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/com.github.rholder/snowball-stemmer -->
         <dependency>
             <groupId>com.github.rholder</groupId>
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/DictionaryUtilities.java b/semanticparser-impl/src/main/java/ai/labs/parser/DictionaryUtilities.java
deleted file mode 100644
index 276aa1e04..000000000
--- a/semanticparser-impl/src/main/java/ai/labs/parser/DictionaryUtilities.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package ai.labs.parser;
-
-import ai.labs.expressions.Expression;
-import ai.labs.expressions.utilities.IExpressionProvider;
-import ai.labs.output.IQuickReply;
-import ai.labs.parser.dictionaries.RegularDictionary;
-import ai.labs.parser.internal.matches.RawSolution;
-import ai.labs.parser.model.IDictionary;
-import ai.labs.parser.rest.model.Solution;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author ginccc
- */
-public class DictionaryUtilities {
-    static List<Expression> convertDictionaryEntriesToExpressions(List<IDictionary.IFoundWord>
-                                                                          dictionaryEntries) {
-        List<Expression> expressions = new LinkedList<>();
-
-        for (IDictionary.IDictionaryEntry dictionaryEntry : dictionaryEntries) {
-            expressions.addAll(dictionaryEntry.getExpressions());
-        }
-
-        return expressions;
-    }
-
-    public static List<Solution> extractExpressions(List<RawSolution> rawSolutions, IExpressionProvider expressionProvider) {
-        List<Solution> solutionExpressions = new ArrayList<>();
-
-        for (RawSolution rawSolution : rawSolutions) {
-            List<Expression> expressions = convertDictionaryEntriesToExpressions(rawSolution.getDictionaryEntries());
-            solutionExpressions.add(new Solution(expressionProvider.toString(expressions)));
-        }
-
-        return solutionExpressions;
-    }
-
-    static List<IDictionary> convertQuickReplies(List<IQuickReply> quickReplies, IExpressionProvider expressionProvider) {
-        List<IDictionary> ret = new LinkedList<>();
-
-        for (IQuickReply quickReply : quickReplies) {
-            RegularDictionary dictionary = new RegularDictionary(null, false);
-            String quickReplyValue = quickReply.getValue();
-            if (quickReplyValue.contains(" ")) {
-                dictionary.addPhrase(quickReplyValue, expressionProvider.parseExpressions(quickReply.getExpressions()));
-            }
-
-            ret.add(dictionary);
-        }
-
-        return ret;
-    }
-
-}
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/IInputParser.java b/semanticparser-impl/src/main/java/ai/labs/parser/IInputParser.java
index 96b5dfc35..4dce5fc81 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/IInputParser.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/IInputParser.java
@@ -1,7 +1,6 @@
 package ai.labs.parser;
 
 import ai.labs.parser.internal.matches.RawSolution;
-import ai.labs.parser.model.IDictionary;
 
 import java.util.List;
 
@@ -10,6 +9,4 @@
  */
 public interface IInputParser {
     List<RawSolution> parse(String sentence);
-
-    List<RawSolution> parse(String sentence, List<IDictionary> temporaryDictionaries);
 }
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/InputParserTask.java b/semanticparser-impl/src/main/java/ai/labs/parser/InputParserTask.java
index ce9f70310..2aac352e2 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/InputParserTask.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/InputParserTask.java
@@ -2,14 +2,10 @@
 
 import ai.labs.expressions.Expression;
 import ai.labs.expressions.utilities.IExpressionProvider;
-import ai.labs.lifecycle.ILifecycleTask;
-import ai.labs.lifecycle.IllegalExtensionConfigurationException;
-import ai.labs.lifecycle.LifecycleException;
-import ai.labs.lifecycle.UnrecognizedExtensionException;
+import ai.labs.lifecycle.*;
 import ai.labs.memory.Data;
 import ai.labs.memory.IConversationMemory;
 import ai.labs.memory.IData;
-import ai.labs.output.IQuickReply;
 import ai.labs.parser.correction.*;
 import ai.labs.parser.dictionaries.*;
 import ai.labs.parser.internal.InputParser;
@@ -25,13 +21,10 @@
 import java.net.URI;
 import java.util.*;
 
-import static ai.labs.parser.DictionaryUtilities.convertQuickReplies;
-import static ai.labs.parser.DictionaryUtilities.extractExpressions;
-
 /**
  * @author ginccc
  */
-public class InputParserTask implements ILifecycleTask {
+public class InputParserTask extends AbstractLifecycleTask implements ILifecycleTask {
     private IInputParser sentenceParser;
     private List<IDictionary> dictionaries;
     private List<ICorrection> corrections;
@@ -73,6 +66,16 @@ public Object getComponent() {
         return sentenceParser;
     }
 
+    @Override
+    public List<String> getComponentDependencies() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<String> getOutputDependencies() {
+        return Collections.emptyList();
+    }
+
     @Override
     public void init() {
         this.sentenceParser = new InputParser(dictionaries, corrections);
@@ -81,27 +84,17 @@ public void init() {
     @Override
     public void executeTask(IConversationMemory memory) throws LifecycleException {
         //parse user input to meanings
-        IData<String> data = memory.getCurrentStep().getLatestData("input");
+        IData data = memory.getCurrentStep().getLatestData("input");
         if (data == null) {
             return;
         }
-
-        IData<QuickReplyList> replyListData = memory.getPreviousSteps().
-                getLatestData("output:quickReplies");
-        List<IQuickReply> quickReplies;
-        if (replyListData != null) {
-            quickReplies = replyListData.getResult();
-        } else {
-            quickReplies = Collections.emptyList();
-        }
-
-        String input = data.getResult();
-        List<RawSolution> parsedSolutions = sentenceParser.parse(input, convertQuickReplies(quickReplies, expressionProvider));
+        String input = (String) data.getResult();
+        List<RawSolution> parsedSolutions = sentenceParser.parse(input);
 
         //store result in memory
         if (!parsedSolutions.isEmpty()) {
-            Solution solution = extractExpressions(parsedSolutions, expressionProvider).get(0);
-            data = new Data<>("expressions:parsed", solution.getExpressions());
+            Solution solution = extractExpressions(parsedSolutions).get(0);
+            data = new Data("expressions:parsed", solution.getExpressions());
             memory.getCurrentStep().storeData(data);
         }
     }
@@ -297,6 +290,11 @@ private void checkIfMap(Object obj, String key, String type) throws IllegalExten
         }
     }
 
+    @Override
+    public void configure(Map<String, Object> configuration) throws PackageConfigurationException {
+        //no configurations for sentenceParser
+    }
+
     private List<Expression> createDefaultExpressionIfNull(String value, String exp) {
         if (RuntimeUtilities.isNullOrEmpty(exp)) {
             return Collections.singletonList(expressionProvider.createExpression("unused", value));
@@ -305,25 +303,42 @@ private List<Expression> createDefaultExpressionIfNull(String value, String exp)
         return expressionProvider.parseExpressions(exp);
     }
 
+    private List<Expression> convertDictionaryEntriesToExpressions(List<IDictionary.IFoundWord> dictionaryEntries) {
+        List<Expression> expressions = new LinkedList<>();
+
+        for (IDictionary.IDictionaryEntry dictionaryEntry : dictionaryEntries) {
+            expressions.addAll(dictionaryEntry.getExpressions());
+        }
+
+        return expressions;
+    }
+
+    public List<Solution> extractExpressions(List<RawSolution> rawSolutions) {
+        List<Solution> solutionExpressions = new ArrayList<>();
+
+        for (RawSolution rawSolution : rawSolutions) {
+            List<Expression> expressions = convertDictionaryEntriesToExpressions(rawSolution.getDictionaryEntries());
+            solutionExpressions.add(new Solution(expressionProvider.toString(expressions)));
+        }
+
+        return solutionExpressions;
+    }
+
     private class UnrecognizedDictionaryException extends UnrecognizedExtensionException {
-        UnrecognizedDictionaryException(String message) {
+        public UnrecognizedDictionaryException(String message) {
             super(message);
         }
     }
 
     private class UnrecognizedCorrectionException extends UnrecognizedExtensionException {
-        UnrecognizedCorrectionException(String message) {
+        public UnrecognizedCorrectionException(String message) {
             super(message);
         }
     }
 
     private class ConfigParamMissingException extends IllegalExtensionConfigurationException {
-        ConfigParamMissingException(String message) {
+        public ConfigParamMissingException(String message) {
             super(message);
         }
     }
-
-    private static class QuickReplyList extends ArrayList<IQuickReply> implements List<IQuickReply> {
-        //reflection purpose only
-    }
 }
diff --git a/semanticparser-impl/src/test/java/ai/labs/parser/TestDictionary.java b/semanticparser-impl/src/main/java/ai/labs/parser/TestDictionary.java
similarity index 67%
rename from semanticparser-impl/src/test/java/ai/labs/parser/TestDictionary.java
rename to semanticparser-impl/src/main/java/ai/labs/parser/TestDictionary.java
index 42df1f6c2..6a76f942f 100644
--- a/semanticparser-impl/src/test/java/ai/labs/parser/TestDictionary.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/TestDictionary.java
@@ -2,7 +2,6 @@
 
 import ai.labs.parser.model.FoundWord;
 import ai.labs.parser.model.IDictionary;
-import lombok.NoArgsConstructor;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -11,19 +10,13 @@
 /**
  * @author ginccc
  */
-@NoArgsConstructor
 public class TestDictionary implements IDictionary {
-    private List<IWord> words = new LinkedList<>();
-    private List<IPhrase> phrases = new LinkedList<>();
-    private boolean lookupIfKnow = false;
-
-    TestDictionary(boolean lookupIfKnow) {
-        this.lookupIfKnow = lookupIfKnow;
-    }
+    private List<IWord> words = new LinkedList<IWord>();
+    private List<IPhrase> phrases = new LinkedList<IPhrase>();
 
     @Override
     public List<IWord> getWords() {
-        LinkedList<IWord> words = new LinkedList<>(this.words);
+        LinkedList<IWord> words = new LinkedList<IWord>(this.words);
         for (IPhrase phrase : phrases) {
             words.addAll(Arrays.asList(phrase.getWords()));
         }
@@ -37,7 +30,7 @@ public List<IPhrase> getPhrases() {
 
     @Override
     public IFoundWord[] lookupTerm(String value) {
-        List<IFoundWord> foundWords = new LinkedList<>();
+        List<IFoundWord> foundWords = new LinkedList<IFoundWord>();
 
         for (IWord word : getWords()) {
             if (word.getValue().equals(value))  {
@@ -55,14 +48,14 @@ public String getLanguage() {
 
     @Override
     public boolean lookupIfKnown() {
-        return lookupIfKnow;
+        return false;
     }
 
-    void addWord(IWord word) {
+    public void addWord(IWord word) {
         this.words.add(word);
     }
 
-    void addPhrase(IPhrase phrase) {
+    public void addPhrase(IPhrase phrase) {
         this.phrases.add(phrase);
     }
 }
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/internal/InputHolder.java b/semanticparser-impl/src/main/java/ai/labs/parser/internal/InputHolder.java
index e35575ace..62e996cde 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/internal/InputHolder.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/internal/InputHolder.java
@@ -13,11 +13,11 @@ public class InputHolder {
     public Integer index = 0;
     private MatchMatrix matchMatrix = new MatchMatrix();
 
-    void addMatch(String inputTerm, MatchingResult matchingResult) {
+    public void addMatch(String inputTerm, MatchingResult matchingResult) {
         matchMatrix.addMatchingResult(inputTerm, matchingResult);
     }
 
-    boolean equalsMatchingTerm(String inputTerm, IDictionary.IDictionaryEntry[] dictionaryEntries) {
+    public boolean equalsMatchingTerm(String inputTerm, IDictionary.IDictionaryEntry[] dictionaryEntries) {
         List<MatchingResult> matchingResults = matchMatrix.getMatchingResults(inputTerm);
         if (matchingResults != null) {
             for (MatchingResult matchingResult : matchingResults) {
@@ -45,12 +45,12 @@ boolean equalsMatchingTerm(String inputTerm, IDictionary.IDictionaryEntry[] dict
         return false;
     }
 
-    int getMatchingResultSize(int index) {
+    public int getMatchingResultSize(int index) {
         List<MatchingResult> matchingResults = matchMatrix.getMatchingResults(index);
         return matchingResults != null ? matchingResults.size() : 0;
     }
 
-    Iterator<Suggestion> createSolutionIterator() {
+    public Iterator<Suggestion> createSolutionIterator() {
         return matchMatrix.iterator();
     }
 }
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/internal/InputParser.java b/semanticparser-impl/src/main/java/ai/labs/parser/internal/InputParser.java
index d019a5e04..96ffd7c3f 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/internal/InputParser.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/internal/InputParser.java
@@ -31,13 +31,42 @@ public InputParser(List<IDictionary> dictionaries, List<ICorrection> corrections
         phrasesMap = preparePhrases(dictionaries);
     }
 
-    @Override
-    public List<RawSolution> parse(String sentence) {
-        return parse(sentence, Collections.emptyList());
+    private Map<IDictionary.IWord, List<IDictionary.IPhrase>> preparePhrases(List<IDictionary> dictionaries) {
+        Map<IDictionary.IWord, List<IDictionary.IPhrase>> phrasesMap = new HashMap<>();
+        for (IDictionary dictionary : dictionaries) {
+            List<IDictionary.IPhrase> dictionaryPhrases = dictionary.getPhrases();
+            for (IDictionary.IPhrase phrase : dictionaryPhrases) {
+                for (IDictionary.IWord wordOfPhrase : phrase.getWords()) {
+                    List<IDictionary.IPhrase> phrases = phrasesMap.computeIfAbsent(wordOfPhrase, k -> new LinkedList<>());
+                    phrases.add(phrase);
+                }
+            }
+        }
+
+        for (IDictionary.IWord word : phrasesMap.keySet()) {
+            List<IDictionary.IPhrase> phrases = phrasesMap.get(word);
+            if (phrases.size() > 1) {
+                orderPhrasesByLength(phrases);
+            }
+        }
+
+        return phrasesMap;
+    }
+
+    private void orderPhrasesByLength(List<IDictionary.IPhrase> phrases) {
+        phrases.sort(Collections.reverseOrder((o1, o2) -> {
+            int lengthWord1 = o1.getWords().length;
+            int lengthWord2 = o2.getWords().length;
+            if (lengthWord1 != lengthWord2) {
+                return lengthWord1 < lengthWord2 ? -1 : lengthWord1 > lengthWord2 ? 1 : 0;
+            } else {
+                return o1.getValue().compareTo(o2.getValue());
+            }
+        }));
     }
 
     @Override
-    public List<RawSolution> parse(String sentence, List<IDictionary> temporaryDictionaries) {
+    public List<RawSolution> parse(String sentence) {
         InputHolder holder = new InputHolder();
         holder.input = sentence.split(" ");
 
@@ -47,8 +76,19 @@ public List<RawSolution> parse(String sentence, List<IDictionary> temporaryDicti
                 continue;
             }
 
-            iterateDictionaries(holder, currentInputPart, temporaryDictionaries);
-            iterateDictionaries(holder, currentInputPart, dictionaries);
+            for (IDictionary dictionary : dictionaries) {
+                if (!dictionary.lookupIfKnown() && holder.getMatchingResultSize(holder.index) != 0) {
+                    //skipped lookup because input part is already known.
+                    continue;
+                }
+
+                //lookup input part in dictionary
+                IDictionary.IFoundWord[] dictionaryEntries = dictionary.lookupTerm(currentInputPart);
+                if (dictionaryEntries.length > 0) {
+                    //add dictionary entries to final result list
+                    addDictionaryEntriesTo(holder, currentInputPart, dictionaryEntries);
+                }
+            }
 
             for (ICorrection correction : corrections) {
                 if (!correction.lookupIfKnown() && holder.getMatchingResultSize(holder.index) != 0) {
@@ -68,23 +108,7 @@ public List<RawSolution> parse(String sentence, List<IDictionary> temporaryDicti
             }
         }
 
-        return lookupPhrases(holder, preparePhrases(temporaryDictionaries));
-    }
-
-    private void iterateDictionaries(InputHolder holder, String currentInputPart, List<IDictionary> dictionaries) {
-        for (IDictionary dictionary : dictionaries) {
-            if (!dictionary.lookupIfKnown() && holder.getMatchingResultSize(holder.index) != 0) {
-                //skipped lookup because input part is already known.
-                continue;
-            }
-
-            //lookup input part in dictionary
-            IDictionary.IFoundWord[] dictionaryEntries = dictionary.lookupTerm(currentInputPart);
-            if (dictionaryEntries.length > 0) {
-                //add dictionary entries to final result list
-                addDictionaryEntriesTo(holder, currentInputPart, dictionaryEntries);
-            }
-        }
+        return lookupPhrases(holder);
     }
 
     private void addDictionaryEntriesTo(InputHolder holder, String matchedInputValue, IDictionary.IFoundWord... foundWords) {
@@ -97,9 +121,7 @@ private void addDictionaryEntriesTo(InputHolder holder, String matchedInputValue
         }
     }
 
-    private List<RawSolution> lookupPhrases(InputHolder holder,
-                                            Map<IDictionary.IWord, List<IDictionary.IPhrase>> tmpPhrasesMap) {
-
+    private List<RawSolution> lookupPhrases(InputHolder holder) {
         List<RawSolution> possibleSolutions = new LinkedList<>();
         Iterator<Suggestion> suggestionIterator = holder.createSolutionIterator();
 
@@ -113,8 +135,7 @@ private List<RawSolution> lookupPhrases(InputHolder holder,
                 return possibleSolutions;
             }
             List<IDictionary.IFoundWord> foundWords = suggestion.build();
-            List<IDictionary.IPhrase> phrasesContainingFoundWords =
-                    getPhrasesContainingFoundWords(foundWords, Arrays.asList(phrasesMap, tmpPhrasesMap));
+            List<IDictionary.IPhrase> phrasesContainingFoundWords = getPhrasesContainingFoundWords(foundWords);
 
             RawSolution rawSolution = null;
             boolean matchingCompleted = false;
@@ -123,7 +144,7 @@ private List<RawSolution> lookupPhrases(InputHolder holder,
             for (IDictionary.IPhrase phrase : phrasesContainingFoundWords) {
                 if (phrase.getWords().length <= foundWords.size()) {
                     foundWords = lookForMatch(foundWords, phrase);
-                    if (foundWords.contains(createPhrase(phrase, 1.0))) {
+                    if (foundWords.contains(createPhrase(phrase, false, 1.0))) {
                         rawSolution = new RawSolution(RawSolution.Match.FULLY);
                     }
 
@@ -145,7 +166,7 @@ private List<RawSolution> lookupPhrases(InputHolder holder,
             for (IDictionary.IPhrase phrase : phrasesContainingFoundWords) {
                 if (phrase.getWords().length > foundWords.size()) {
                     foundWords = lookForPartlyMatch(foundWords, phrase);
-                    if (foundWords.contains(createPhrase(phrase, 0.5))) {
+                    if (foundWords.contains(createPhrase(phrase, false, 0.5))) {
                         if (rawSolution == null) {
                             rawSolution = new RawSolution(RawSolution.Match.PARTLY);
                         }
@@ -210,7 +231,7 @@ private List<IDictionary.IFoundWord> lookForMatch(List<IDictionary.IFoundWord> f
             if (startOfMatch > 0) {
                 ret.addAll(foundWords.subList(0, startOfMatch));
             }
-            ret.add(createPhrase(phrase, 1.0));
+            ret.add(createPhrase(phrase, false, 1.0));
             int rangeOfMatch = startOfMatch + phrase.getWords().length;
             if (rangeOfMatch < foundWords.size()) {
                 ret.addAll(foundWords.subList(rangeOfMatch, foundWords.size()));
@@ -223,6 +244,10 @@ private List<IDictionary.IFoundWord> lookForMatch(List<IDictionary.IFoundWord> f
         }
     }
 
+    private IDictionary.IFoundWord createPhrase(IDictionary.IPhrase phrase, boolean corrected, double matchingAccuracy) {
+        return new FoundPhrase(phrase, corrected, matchingAccuracy);
+    }
+
     private IDictionary.IWord[] convert(List<IDictionary.IFoundWord> foundWords) {
         IDictionary.IWord[] ret = new IDictionary.IWord[foundWords.size()];
 
@@ -233,12 +258,7 @@ private IDictionary.IWord[] convert(List<IDictionary.IFoundWord> foundWords) {
         return ret;
     }
 
-    private IDictionary.IFoundWord createPhrase(IDictionary.IPhrase phrase, double matchingAccuracy) {
-        return new FoundPhrase(phrase, false, matchingAccuracy);
-    }
-
-    private List<IDictionary.IFoundWord> lookForPartlyMatch(List<IDictionary.IFoundWord> dictionaryEntries,
-                                                            IDictionary.IPhrase phrase) {
+    private List<IDictionary.IFoundWord> lookForPartlyMatch(List<IDictionary.IFoundWord> dictionaryEntries, IDictionary.IPhrase phrase) {
         IDictionary.IWord[] phraseWords = phrase.getWords();
         int startOfMatch = LanguageUtilities.containsArray(dictionaryEntries.toArray(), phraseWords);
         if (startOfMatch > -1) {
@@ -247,7 +267,7 @@ private List<IDictionary.IFoundWord> lookForPartlyMatch(List<IDictionary.IFoundW
             if (startOfMatch > 0) {
                 ret.addAll(dictionaryEntries.subList(0, startOfMatch - 1));
             }
-            ret.add(createPhrase(phrase, 1.0));
+            ret.add(createPhrase(phrase, false, 1.0));
             int rangeOfMatch = startOfMatch + phraseWords.length;
             if (rangeOfMatch < dictionaryEntries.size()) {
                 ret.addAll(dictionaryEntries.subList(rangeOfMatch, dictionaryEntries.size()));
@@ -260,54 +280,15 @@ private List<IDictionary.IFoundWord> lookForPartlyMatch(List<IDictionary.IFoundW
         }
     }
 
-    private Map<IDictionary.IWord, List<IDictionary.IPhrase>> preparePhrases(List<IDictionary> dictionaries) {
-        Map<IDictionary.IWord, List<IDictionary.IPhrase>> phrasesMap = new HashMap<>();
-        for (IDictionary dictionary : dictionaries) {
-            List<IDictionary.IPhrase> dictionaryPhrases = dictionary.getPhrases();
-            for (IDictionary.IPhrase phrase : dictionaryPhrases) {
-                for (IDictionary.IWord wordOfPhrase : phrase.getWords()) {
-                    List<IDictionary.IPhrase> phrases = phrasesMap.computeIfAbsent(wordOfPhrase, k -> new LinkedList<>());
-                    phrases.add(phrase);
-                }
-            }
-        }
-
-        for (IDictionary.IWord word : phrasesMap.keySet()) {
-            List<IDictionary.IPhrase> phrases = phrasesMap.get(word);
-            if (phrases.size() > 1) {
-                orderPhrasesByLength(phrases);
-            }
-        }
-
-        return phrasesMap;
-    }
-
-    private void orderPhrasesByLength(List<IDictionary.IPhrase> phrases) {
-        phrases.sort(Collections.reverseOrder((o1, o2) -> {
-            int lengthWord1 = o1.getWords().length;
-            int lengthWord2 = o2.getWords().length;
-            if (lengthWord1 != lengthWord2) {
-                return Integer.compare(lengthWord1, lengthWord2);
-            } else {
-                return o1.getValue().compareTo(o2.getValue());
-            }
-        }));
-    }
-
-    private List<IDictionary.IPhrase> getPhrasesContainingFoundWords(
-            List<IDictionary.IFoundWord> foundWords,
-            List<Map<IDictionary.IWord, List<IDictionary.IPhrase>>> phrasesMaps) {
-
+    private List<IDictionary.IPhrase> getPhrasesContainingFoundWords(List<IDictionary.IFoundWord> foundWords) {
         List<IDictionary.IPhrase> ret = new LinkedList<>();
         for (IDictionary.IFoundWord foundWord : foundWords) {
             if (foundWord.isPhrase()) continue;
-            for (Map<IDictionary.IWord, List<IDictionary.IPhrase>> phrasesMap : phrasesMaps) {
-                List<IDictionary.IPhrase> phrases = phrasesMap.get(foundWord.getFoundWord());
-                if (phrases != null) {
-                    for (IDictionary.IPhrase phrase : phrases) {
-                        if (!ret.contains(phrase)) {
-                            ret.add(phrase);
-                        }
+            List<IDictionary.IPhrase> phrases = phrasesMap.get(foundWord.getFoundWord());
+            if (phrases != null) {
+                for (IDictionary.IPhrase phrase : phrases) {
+                    if (!ret.contains(phrase)) {
+                        ret.add(phrase);
                     }
                 }
             }
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/IterationCounter.java b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/IterationCounter.java
index 2b81c00f6..458a001ee 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/IterationCounter.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/IterationCounter.java
@@ -9,7 +9,7 @@ class IterationCounter implements Iterator<IterationCounter.IterationPlan> {
     private IterationPlan next;
     private Integer[] indexes;
     private Iterator<Integer[]> permutationIterator;
-    private List<IterationPlan> previousIterationPlans = new LinkedList<>();
+    private List<IterationPlan> previousIterationPlans = new LinkedList<IterationPlan>();
     private Integer inputLength;
     private Integer[] resultLengths;
     private int overallIterations;
@@ -156,7 +156,7 @@ private IterationPlan(Integer[] indexes) {
             System.arraycopy(indexes, 0, this.indexes, 0, indexes.length);
         }
 
-        Integer[] getIndexes() {
+        public Integer[] getIndexes() {
             return indexes;
         }
 
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/MatchMatrix.java b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/MatchMatrix.java
index 74fbc24a4..c48852aa5 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/MatchMatrix.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/MatchMatrix.java
@@ -6,11 +6,11 @@
  * @author ginccc
  */
 public class MatchMatrix implements Iterable<Suggestion> {
-    private Map<String, List<MatchingResult>> mappedMatchMatrix = new LinkedHashMap<>();
+    private Map<String, List<MatchingResult>> mappedMatchMatrix = new LinkedHashMap<String, List<MatchingResult>>();
 
     public void addMatchingResult(String inputTerm, MatchingResult matchingResult) {
         if (!mappedMatchMatrix.containsKey(inputTerm)) {
-            mappedMatchMatrix.put(inputTerm, new LinkedList<>());
+            mappedMatchMatrix.put(inputTerm, new LinkedList<MatchingResult>());
         }
 
         mappedMatchMatrix.get(inputTerm).add(matchingResult);
@@ -27,7 +27,7 @@ public List<MatchingResult> getMatchingResults(String inputTerm) {
     public List<MatchingResult> getMatchingResults(int index) {
         Collection<List<MatchingResult>> allMatchingResults = mappedMatchMatrix.values();
         if (index < allMatchingResults.size()) {
-            return new ArrayList<>(allMatchingResults).get(index);
+            return (List<MatchingResult>) allMatchingResults.toArray()[index];
         }
 
         return null;
@@ -43,7 +43,7 @@ class SolutionIterator implements Iterator<Suggestion> {
         private Suggestion nextSuggestion = null;
         private final Integer[] resultLengths;
 
-        SolutionIterator() {
+        public SolutionIterator() {
             resultLengths = createResultLengths(mappedMatchMatrix.values());
             iterationCounter = new IterationCounter(mappedMatchMatrix.size(), resultLengths);
             if (iterationCounter.hasNext()) {
@@ -82,7 +82,7 @@ public Suggestion next() {
         }
 
         private Suggestion calculateNext() {
-            Suggestion nextSuggestion;
+            Suggestion nextSuggestion = null;
             while (iterationCounter.hasNext()) {
                 IterationCounter.IterationPlan iterationPlan = iterationCounter.next();
 
@@ -105,7 +105,7 @@ private Suggestion calculateNext() {
                 }
             }
 
-            return null;
+            return nextSuggestion;
         }
 
         @Override
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/MatchingResult.java b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/MatchingResult.java
index 867b246d4..3c455c227 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/MatchingResult.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/MatchingResult.java
@@ -1,7 +1,6 @@
 package ai.labs.parser.internal.matches;
 
 import ai.labs.parser.model.IDictionary;
-import lombok.Getter;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -10,25 +9,31 @@
 /**
  * @author ginccc
  */
-@Getter
 public class MatchingResult {
-    private List<IDictionary.IFoundWord> result;
+    private List<IDictionary.IFoundWord> result = new LinkedList<IDictionary.IFoundWord>();
     private boolean corrected;
 
     public MatchingResult() {
         this(false);
     }
 
-    private MatchingResult(boolean corrected) {
+    public MatchingResult(boolean corrected) {
         this.corrected = corrected;
-        result = new LinkedList<>();
     }
 
-    private void addResult(List<IDictionary.IFoundWord> dictionaryEntries) {
+    public void addResult(List<IDictionary.IFoundWord> dictionaryEntries) {
         result.addAll(dictionaryEntries);
     }
 
     public void addResult(IDictionary.IFoundWord... dictionaryEntries) {
         addResult(Arrays.asList(dictionaryEntries));
     }
+
+    public List<IDictionary.IFoundWord> getResult() {
+        return result;
+    }
+
+    public boolean isCorrected() {
+        return corrected;
+    }
 }
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/Permutation.java b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/Permutation.java
index 4b0b5e435..5b8260ca7 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/Permutation.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/Permutation.java
@@ -10,7 +10,7 @@
 public class Permutation implements Iterable<Integer[]> {
     private Integer[] values;
 
-    Permutation(Integer[] values) {
+    public Permutation(Integer[] values) {
         this.values = values;
     }
 
@@ -27,7 +27,7 @@ public class PermutationIterator implements Iterator<Integer[]> {
 
         private Integer[] next = null;
 
-        PermutationIterator(Integer[] values) {
+        public PermutationIterator(Integer[] values) {
             this.values = values;
 
             Arrays.sort(this.values);
@@ -69,7 +69,7 @@ private Integer[] calculateNext() {
                 int firstNonDecreasingIndex = -1, swapPoint = -1;
 
                 for (int i = values.length - 1; i > 0; i--) {
-                    if (values[i - 1].compareTo(values[i]) < 0) {
+                    if (values[i - 1].compareTo(values[i]) == -1) {
                         firstNonDecreasingIndex = i - 1;
                         break;
                     } else if (i == 1) {
@@ -78,7 +78,7 @@ private Integer[] calculateNext() {
                 }//from the end, find first index that arrayToPermute[index]<arrayToPermute[index+1]
 
                 for (int i = values.length - 1; i > firstNonDecreasingIndex; i--) {
-                    if (values[firstNonDecreasingIndex].compareTo(values[i]) < 0) {
+                    if (values[firstNonDecreasingIndex].compareTo(values[i]) == -1) {
                         swapPoint = i;
                         break;
                     }//finding the first numthat arrayToPermute[swapPoint]>arrayToPermute[index]
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/Suggestion.java b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/Suggestion.java
index c84b368aa..54ab9a40d 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/Suggestion.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/internal/matches/Suggestion.java
@@ -9,14 +9,14 @@
  * @author ginccc
  */
 public class Suggestion {
-    private List<MatchingResult> rawSolution = new LinkedList<>();
+    private List<MatchingResult> rawSolution = new LinkedList<MatchingResult>();
 
-    void addMatchingResult(MatchingResult matchingResult) {
+    public void addMatchingResult(MatchingResult matchingResult) {
         rawSolution.add(matchingResult);
     }
 
     public List<IDictionary.IFoundWord> build() {
-        List<IDictionary.IFoundWord> dictionaryEntries = new LinkedList<>();
+        List<IDictionary.IFoundWord> dictionaryEntries = new LinkedList<IDictionary.IFoundWord>();
         for (MatchingResult matchingResult : rawSolution) {
             dictionaryEntries.addAll(matchingResult.getResult());
         }
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/model/DictionaryEntry.java b/semanticparser-impl/src/main/java/ai/labs/parser/model/DictionaryEntry.java
index 3dab48f96..920132acd 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/model/DictionaryEntry.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/model/DictionaryEntry.java
@@ -12,19 +12,19 @@ public class DictionaryEntry implements IDictionary.IDictionaryEntry {
     protected String value;
 
     protected List<Expression> expressions;
-    private String identifier;
-    private int rating;
+    protected String identifier;
+    protected int rating;
 
-    boolean isWord = false;
-    boolean isPhrase = false;
+    protected boolean isWord = false;
+    protected boolean isPhrase = false;
 
-    int frequency;
+    protected int frequency;
 
-    DictionaryEntry(String value, List<Expression> expressions) {
+    public DictionaryEntry(String value, List<Expression> expressions) {
         this(value, expressions, "", 0);
     }
 
-    DictionaryEntry(String value, List<Expression> expressions, String identifier, int rating) {
+    public DictionaryEntry(String value, List<Expression> expressions, String identifier, int rating) {
         this.value = value;
         this.expressions = expressions;
         this.identifier = identifier;
@@ -47,6 +47,10 @@ public String getIdentifier() {
         return identifier;
     }
 
+    public int getRating() {
+        return rating;
+    }
+
     public boolean isWord() {
         return isWord;
     }
@@ -95,7 +99,7 @@ public int compareTo(IDictionary.IDictionaryEntry dictionaryEntry) {
         if (frequency == dictionaryEntry.getFrequency()) {
             return value.compareTo(dictionaryEntry.getValue());
         } else {
-            return Integer.compare(frequency, dictionaryEntry.getFrequency());
+            return frequency < dictionaryEntry.getFrequency() ? -1 : frequency == dictionaryEntry.getFrequency() ? 0 : 1;
         }
     }
 }
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/model/Word.java b/semanticparser-impl/src/main/java/ai/labs/parser/model/Word.java
index 45007efc5..27c6cd247 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/model/Word.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/model/Word.java
@@ -45,6 +45,6 @@ public int hashCode() {
 
     @Override
     public int compareTo(IDictionary.IDictionaryEntry o) {
-        return Integer.compare(frequency, o.getFrequency());
+        return frequency < o.getFrequency() ? -1 : frequency == o.getFrequency() ? 0 : 1;
     }
 }
diff --git a/semanticparser-impl/src/main/java/ai/labs/parser/rest/impl/RestSemanticParser.java b/semanticparser-impl/src/main/java/ai/labs/parser/rest/impl/RestSemanticParser.java
index 2cc524603..f005bdaac 100644
--- a/semanticparser-impl/src/main/java/ai/labs/parser/rest/impl/RestSemanticParser.java
+++ b/semanticparser-impl/src/main/java/ai/labs/parser/rest/impl/RestSemanticParser.java
@@ -2,7 +2,6 @@
 
 import ai.labs.caching.ICache;
 import ai.labs.caching.ICacheFactory;
-import ai.labs.expressions.utilities.IExpressionProvider;
 import ai.labs.lifecycle.ILifecycleTask;
 import ai.labs.parser.IInputParser;
 import ai.labs.parser.InputParserTask;
@@ -27,8 +26,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
-import static ai.labs.parser.DictionaryUtilities.extractExpressions;
-
 /**
  * @author ginccc
  */
@@ -36,7 +33,6 @@
 public class RestSemanticParser implements IRestSemanticParser {
     private final SystemRuntime.IRuntime runtime;
     private final IResourceClientLibrary resourceClientLibrary;
-    private final IExpressionProvider expressionProvider;
     private final Provider<ILifecycleTask> parserProvider;
     private final ICache<URI, InputParserTask> cache;
 
@@ -44,12 +40,10 @@ public class RestSemanticParser implements IRestSemanticParser {
     public RestSemanticParser(SystemRuntime.IRuntime runtime,
                               IResourceClientLibrary resourceClientLibrary,
                               ICacheFactory cacheFactory,
-                              IExpressionProvider expressionProvider,
                               Map<String, Provider<ILifecycleTask>> lifecycleTasks) {
         this.runtime = runtime;
         this.resourceClientLibrary = resourceClientLibrary;
         cache = cacheFactory.getCache("ai.labs.parser");
-        this.expressionProvider = expressionProvider;
         parserProvider = lifecycleTasks.get("ai.labs.parser");
     }
 
@@ -64,7 +58,7 @@ public void parse(String configId, Integer version, String sentence, AsyncRespon
                 InputParserTask inputParserTask = getParser(resourceUri);
                 IInputParser inputParser = (IInputParser) inputParserTask.getComponent();
                 List<RawSolution> rawSolutions = inputParser.parse(sentence);
-                List<Solution> solutionExpressions = extractExpressions(rawSolutions, expressionProvider);
+                List<Solution> solutionExpressions = inputParserTask.extractExpressions(rawSolutions);
                 asyncResponse.resume(solutionExpressions);
             } catch (IllegalArgumentException e) {
                 asyncResponse.resume(new BadRequestException(e.getLocalizedMessage()));
diff --git a/semanticparser-impl/src/test/java/ai/labs/parser/InputParserTest.java b/semanticparser-impl/src/test/java/ai/labs/parser/InputParserTest.java
index 53d9ec717..7e594c63b 100644
--- a/semanticparser-impl/src/test/java/ai/labs/parser/InputParserTest.java
+++ b/semanticparser-impl/src/test/java/ai/labs/parser/InputParserTest.java
@@ -21,11 +21,11 @@
  */
 @Slf4j
 public class InputParserTest {
-    private IExpressionProvider expressionProvider;
+    private IExpressionProvider expressionUtilities;
 
     @Before
     public void setup() {
-        expressionProvider = new ExpressionProvider(new ExpressionFactory());
+        expressionUtilities = new ExpressionProvider(new ExpressionFactory());
     }
 
     @Test
@@ -33,8 +33,8 @@ public void testParseWord() throws Exception {
         //setup
         String lookupString = "test1 test2";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addWord(new Word("test1", expressionProvider.parseExpressions("expression1"), "exp1", 0, false));
-        testDictionary.addWord(new Word("test2", expressionProvider.parseExpressions("expression2"), "exp2", 0, false));
+        testDictionary.addWord(new Word("test1", expressionUtilities.parseExpressions("expression1"), "exp1", 0, false));
+        testDictionary.addWord(new Word("test2", expressionUtilities.parseExpressions("expression2"), "exp2", 0, false));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary));
 
         //test
@@ -51,7 +51,7 @@ public void testParsePhrase() throws Exception {
         //setup
         String lookupString = "day after tomorrow";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary), Collections.emptyList());
 
         //test
@@ -59,7 +59,7 @@ public void testParsePhrase() throws Exception {
 
         //assert
         Assert.assertEquals("day after tomorrow", suggestions.get(0).getDictionaryEntries().get(0).getValue());
-        Assert.assertEquals("phrase(day_after_tomorrow)", expressionProvider.toString(suggestions.get(0).getDictionaryEntries().get(0).getExpressions()));
+        Assert.assertEquals("phrase(day_after_tomorrow)", expressionUtilities.toString(suggestions.get(0).getDictionaryEntries().get(0).getExpressions()));
     }
 
     @Test
@@ -67,7 +67,7 @@ public void testParsePhrase2() throws Exception {
         //setup
         String lookupString = "someword day after tomorrow";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary));
 
         //test
@@ -78,9 +78,9 @@ public void testParsePhrase2() throws Exception {
         Assert.assertEquals(1, suggestions.size());
         Assert.assertEquals(2, found.size());
         Assert.assertEquals("someword", found.get(0).getValue());
-        Assert.assertEquals("unknown(someword)", expressionProvider.toString(found.get(0).getExpressions()));
+        Assert.assertEquals("unknown(someword)", expressionUtilities.toString(found.get(0).getExpressions()));
         Assert.assertEquals("day after tomorrow", found.get(1).getValue());
-        Assert.assertEquals("phrase(day_after_tomorrow)", expressionProvider.toString(found.get(1).getExpressions()));
+        Assert.assertEquals("phrase(day_after_tomorrow)", expressionUtilities.toString(found.get(1).getExpressions()));
     }
 
     @Test
@@ -88,7 +88,7 @@ public void testParsePhrase3() throws Exception {
         //setup
         String lookupString = "day after tomorrow someword";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary));
 
         //test
@@ -96,7 +96,7 @@ public void testParsePhrase3() throws Exception {
 
         //assert
         Assert.assertEquals("day after tomorrow", suggestions.get(0).getDictionaryEntries().get(0).getValue());
-        Assert.assertEquals("phrase(day_after_tomorrow)", expressionProvider.toString(suggestions.get(0).getDictionaryEntries().get(0).getExpressions()));
+        Assert.assertEquals("phrase(day_after_tomorrow)", expressionUtilities.toString(suggestions.get(0).getDictionaryEntries().get(0).getExpressions()));
     }
 
     @Test
@@ -104,7 +104,7 @@ public void testParsePhrase4() throws Exception {
         //setup
         String lookupString = "someword day after tomorrow someword";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary));
 
         //test
@@ -112,7 +112,7 @@ public void testParsePhrase4() throws Exception {
 
         //assert
         Assert.assertEquals("day after tomorrow", suggestions.get(0).getDictionaryEntries().get(1).getValue());
-        Assert.assertEquals("phrase(day_after_tomorrow)", expressionProvider.toString(suggestions.get(0).getDictionaryEntries().get(1).getExpressions()));
+        Assert.assertEquals("phrase(day_after_tomorrow)", expressionUtilities.toString(suggestions.get(0).getDictionaryEntries().get(1).getExpressions()));
     }
 
     @Test
@@ -120,7 +120,7 @@ public void testParsePhrase5() throws Exception {
         //setup
         String lookupString = "day someword after tomorrow";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary));
 
         //test
@@ -139,8 +139,8 @@ public void testParsePhrase6() throws Exception {
         //setup
         String lookupString = "day after tomorrow";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addPhrase(new Phrase("day after", expressionProvider.parseExpressions("phrase(day_after)"), ""));
-        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        testDictionary.addPhrase(new Phrase("day after", expressionUtilities.parseExpressions("phrase(day_after)"), ""));
+        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary));
 
         //test
@@ -148,7 +148,7 @@ public void testParsePhrase6() throws Exception {
 
         //assert
         Assert.assertEquals("day after tomorrow", suggestions.get(0).getDictionaryEntries().get(0).getValue());
-        Assert.assertEquals("phrase(day_after_tomorrow)", expressionProvider.toString(suggestions.get(0).getDictionaryEntries().get(0).getExpressions()));
+        Assert.assertEquals("phrase(day_after_tomorrow)", expressionUtilities.toString(suggestions.get(0).getDictionaryEntries().get(0).getExpressions()));
     }
 
     @Test
@@ -156,12 +156,12 @@ public void testResultset() throws Exception {
         //setup
         String lookupString = "day after tomorrow";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addWord(new Word("day", expressionProvider.parseExpressions("unused(day)"), "", 0, false));
-        testDictionary.addWord(new Word("day", expressionProvider.parseExpressions("unused(day1)"), "", 0, false));
-        testDictionary.addWord(new Word("after", expressionProvider.parseExpressions("unused(after)"), "", 0, false));
-        testDictionary.addWord(new Word("after", expressionProvider.parseExpressions("unused(after1)"), "", 0, false));
-        testDictionary.addWord(new Word("tomorrow", expressionProvider.parseExpressions("unused(tomorrow)"), "", 0, false));
-        testDictionary.addWord(new Word("tomorrow", expressionProvider.parseExpressions("unused(tomorrow1)"), "", 0, false));
+        testDictionary.addWord(new Word("day", expressionUtilities.parseExpressions("unused(day)"), "", 0, false));
+        testDictionary.addWord(new Word("day", expressionUtilities.parseExpressions("unused(day1)"), "", 0, false));
+        testDictionary.addWord(new Word("after", expressionUtilities.parseExpressions("unused(after)"), "", 0, false));
+        testDictionary.addWord(new Word("after", expressionUtilities.parseExpressions("unused(after1)"), "", 0, false));
+        testDictionary.addWord(new Word("tomorrow", expressionUtilities.parseExpressions("unused(tomorrow)"), "", 0, false));
+        testDictionary.addWord(new Word("tomorrow", expressionUtilities.parseExpressions("unused(tomorrow1)"), "", 0, false));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary));
 
         //test
@@ -181,8 +181,8 @@ public void testParse2Phrase() throws Exception {
         //setup
         String lookupString = "day after tomorrow another phrase";
         TestDictionary testDictionary = new TestDictionary();
-        testDictionary.addPhrase(new Phrase("another phrase", expressionProvider.parseExpressions("phrase(another_phrase)"), ""));
-        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        testDictionary.addPhrase(new Phrase("another phrase", expressionUtilities.parseExpressions("phrase(another_phrase)"), ""));
+        testDictionary.addPhrase(new Phrase("day after tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
         InputParser inputParser = new InputParser(Collections.singletonList(testDictionary), Collections.emptyList());
 
         //test
@@ -193,8 +193,8 @@ public void testParse2Phrase() throws Exception {
         List<IDictionary.IFoundWord> foundWords = suggestions.get(0).getDictionaryEntries();
         Assert.assertEquals(2, foundWords.size());
         Assert.assertEquals("day after tomorrow", foundWords.get(0).getValue());
-        Assert.assertEquals("phrase(day_after_tomorrow)", expressionProvider.toString(foundWords.get(0).getExpressions()));
+        Assert.assertEquals("phrase(day_after_tomorrow)", expressionUtilities.toString(foundWords.get(0).getExpressions()));
         Assert.assertEquals("another phrase", foundWords.get(1).getValue());
-        Assert.assertEquals("phrase(another_phrase)", expressionProvider.toString(foundWords.get(1).getExpressions()));
+                Assert.assertEquals("phrase(another_phrase)", expressionUtilities.toString(foundWords.get(1).getExpressions()));
     }
 }
diff --git a/semanticparser-impl/src/test/java/ai/labs/parser/TemporaryDictionaryParserTest.java b/semanticparser-impl/src/test/java/ai/labs/parser/TemporaryDictionaryParserTest.java
deleted file mode 100644
index 390b4f280..000000000
--- a/semanticparser-impl/src/test/java/ai/labs/parser/TemporaryDictionaryParserTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package ai.labs.parser;
-
-import ai.labs.expressions.ExpressionFactory;
-import ai.labs.expressions.utilities.ExpressionProvider;
-import ai.labs.parser.internal.InputParser;
-import ai.labs.parser.internal.matches.RawSolution;
-import ai.labs.parser.model.Phrase;
-import ai.labs.parser.model.Word;
-import ai.labs.parser.rest.model.Solution;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author ginccc
- */
-public class TemporaryDictionaryParserTest {
-
-    private ExpressionProvider expressionProvider;
-    private InputParser inputParser;
-
-    @Before
-    public void setup() {
-        expressionProvider = new ExpressionProvider(new ExpressionFactory());
-
-        //setup
-        TestDictionary testDictionary = new TestDictionary(true);
-        testDictionary.addWord(new Word("test1", expressionProvider.parseExpressions("expression1"), "exp1", 0, false));
-        testDictionary.addWord(new Word("test2", expressionProvider.parseExpressions("expression2"), "exp2", 0, false));
-        inputParser = new InputParser(Collections.singletonList(testDictionary));
-    }
-
-    @Test
-    public void testRecognitionOfTemporaryDictionaryWord() {
-        //setup
-        TestDictionary temporaryTestDictionary = new TestDictionary();
-        temporaryTestDictionary.addWord(new Word("tmp1", expressionProvider.parseExpressions("tmpExp1"), "tmpExp1", 0, false));
-        temporaryTestDictionary.addWord(new Word("tmp2", expressionProvider.parseExpressions("tmpExp2"), "tmpExp2", 0, false));
-        List<Solution> expected = Collections.singletonList(new Solution("expression1, expression2, tmpExp1, tmpExp2"));
-
-        //test
-        List<RawSolution> rawSolutions = inputParser.parse("test1 test2 tmp1 tmp2",
-                Collections.singletonList(temporaryTestDictionary));
-
-        //assert
-        List<Solution> actual = DictionaryUtilities.extractExpressions(rawSolutions, expressionProvider);
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void testRecognitionOfTemporaryDictionaryPhrase() {
-        //setup
-        TestDictionary temporaryTestDictionary = new TestDictionary();
-        temporaryTestDictionary.addPhrase(new Phrase("test tmp phrase", expressionProvider.parseExpressions
-                ("tmpExp1"), "tmpExp1"));
-        List<Solution> expected = Collections.singletonList(new Solution("expression1, expression2, tmpExp1"));
-
-        //test
-        List<RawSolution> rawSolutions = inputParser.parse("test1 test2 test tmp phrase",
-                Collections.singletonList(temporaryTestDictionary));
-
-        //assert
-        List<Solution> actual = DictionaryUtilities.extractExpressions(rawSolutions, expressionProvider);
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void testPreferTmpDictionaryWordOverPredefinedDictionaryWords() {
-        //setup
-        TestDictionary temporaryTestDictionary = new TestDictionary();
-        temporaryTestDictionary.addWord(new Word("test1", expressionProvider.parseExpressions("tmpExp1"), "tmpExp1",
-                0, false));
-        List<Solution> expected = Collections.singletonList(new Solution("tmpExp1"));
-
-        //test
-        List<RawSolution> rawSolutions = inputParser.parse("test1",
-                Collections.singletonList(temporaryTestDictionary));
-
-        //assert
-        List<Solution> actual = DictionaryUtilities.extractExpressions(rawSolutions, expressionProvider);
-        Assert.assertEquals(expected, actual);
-    }
-}
diff --git a/semanticparser-impl/src/test/java/ai/labs/parser/internal/phrases/PhraseExpressionTest.java b/semanticparser-impl/src/test/java/ai/labs/parser/internal/phrases/PhraseExpressionTest.java
new file mode 100644
index 000000000..96592d6be
--- /dev/null
+++ b/semanticparser-impl/src/test/java/ai/labs/parser/internal/phrases/PhraseExpressionTest.java
@@ -0,0 +1,78 @@
+package ai.labs.parser.internal.phrases;
+
+import ai.labs.expressions.ExpressionFactory;
+import ai.labs.expressions.utilities.ExpressionProvider;
+import ai.labs.expressions.utilities.IExpressionProvider;
+import ai.labs.parser.TestDictionary;
+import ai.labs.parser.internal.InputParser;
+import ai.labs.parser.internal.matches.RawSolution;
+import ai.labs.parser.model.IDictionary;
+import ai.labs.parser.model.Phrase;
+import ai.labs.parser.model.Word;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author ginccc
+ */
+@Slf4j
+public class PhraseExpressionTest {
+
+    private IExpressionProvider expressionUtilities;
+
+    @Before
+    public void setup() {
+        expressionUtilities = new ExpressionProvider(new ExpressionFactory());
+    }
+
+    @Test
+    public void testParsePhraseWithExpression() throws Exception {
+        //setup
+        String lookupString = "day after tomorrow";
+        TestDictionary testDictionary = new TestDictionary();
+        testDictionary.addWord(new Word("after", expressionUtilities.parseExpressions("unused(after)"), "", 0, false));
+        testDictionary.addPhrase(new Phrase("day [exp:unused(after)] tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        InputParser inputParser = new InputParser(Collections.singletonList(testDictionary), Collections.emptyList());
+
+        //test
+        List<RawSolution> rawSolutions = inputParser.parse(lookupString);
+
+        //assert
+        Assert.assertEquals("day after tomorrow", convert(rawSolutions.get(0).getDictionaryEntries()));
+    }
+
+    @Test
+    public void testParsePhraseWithExpression1() throws Exception {
+        //setup
+        String lookupString = "day after tomorrow";
+        TestDictionary testDictionary = new TestDictionary();
+        testDictionary.addWord(new Word("after", expressionUtilities.parseExpressions("unused(af), unused(ter)"), "", 0, false));
+        testDictionary.addPhrase(new Phrase("day [exp:unused(af),unused(ter)] tomorrow", expressionUtilities.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        InputParser inputParser = new InputParser(Collections.singletonList(testDictionary), Collections.emptyList());
+
+        //test
+        List<RawSolution> rawSolutions = inputParser.parse(lookupString);
+
+        //assert
+        Assert.assertEquals("day after tomorrow", convert(rawSolutions.get(0).getDictionaryEntries()));
+    }
+
+    private String convert(List<IDictionary.IFoundWord> dictionaryEntries) {
+        StringBuilder ret = new StringBuilder();
+
+        for (IDictionary.IFoundWord dictionaryEntry : dictionaryEntries) {
+            ret.append(dictionaryEntry.getFoundWord().getValue()).append(" ");
+        }
+
+        if (!dictionaryEntries.isEmpty()) {
+            ret.deleteCharAt(ret.length() - 1);
+        }
+
+        return ret.toString();
+    }
+}
diff --git a/semanticparser-impl/src/test/java/ai/labs/parser/internal/phrases/PhraseRegexTest.java b/semanticparser-impl/src/test/java/ai/labs/parser/internal/phrases/PhraseRegexTest.java
new file mode 100644
index 000000000..d8f018c7b
--- /dev/null
+++ b/semanticparser-impl/src/test/java/ai/labs/parser/internal/phrases/PhraseRegexTest.java
@@ -0,0 +1,38 @@
+package ai.labs.parser.internal.phrases;
+
+/**
+ * @author ginccc
+ */
+public class PhraseRegexTest {
+    /*@Test
+    public void testParsePhraseWithRegex() throws Exception {
+        //setup
+        String lookupString = "day after tomorrow";
+        TestDictionary testDictionary = new TestDictionary();
+        testDictionary.addWord(new Word("after", "after", ExpressionProvider.parseExpressions("unused(after)"), "", 0, false));
+        testDictionary.addPhrase(new Phrase("day [regex:[a-z]*] tomorrow", ExpressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        InputParser inputParser = new InputParser(Arrays.asList((IDictionary) testDictionary));
+
+        //test
+        List<Suggestion> result = inputParser.parse(lookupString);
+
+        //assert
+        Assert.assertEquals("day after tomorrow", result.get(0).build().get(0).getFoundValue());
+    }
+
+    @Test
+    public void testParsePhraseWithRegex1() throws Exception {
+        //setup
+        String lookupString = "day after tomorrow";
+        TestDictionary testDictionary = new TestDictionary();
+        testDictionary.addWord(new Word("after", "after", ExpressionProvider.parseExpressions("unused(after)"), "", 0, false));
+        testDictionary.addPhrase(new Phrase("day [regex:[0-9]*] tomorrow", ExpressionProvider.parseExpressions("phrase(day_after_tomorrow)"), ""));
+        InputParser inputParser = new InputParser(Arrays.asList((IDictionary) testDictionary));
+
+        //test
+        List<Suggestion> result = inputParser.parse(lookupString);
+
+        //assert
+        Assert.assertNotSame("day after tomorrow", result.get(0).build().get(0).getFoundValue());
+    }*/
+}