From 29d4b1e6e860ba25d701b49a52acf4c47e06543c Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Mon, 25 Feb 2019 19:30:54 +0530
Subject: [PATCH 01/21] Add state classes

---
 .../core/partition/PartitionRuntime.java      |  1 +
 .../partition/PartitionStreamReceiver.java    | 10 +++-
 .../snapshot/state/PartitionStateHolder.java  | 55 +++++++++++++++++++
 .../snapshot/state/SingleStateHolder.java     | 37 +++++++++++++
 .../core/util/snapshot/state/State.java       | 24 ++++++++
 .../util/snapshot/state/StateFactory.java     | 24 ++++++++
 .../core/util/snapshot/state/StateHolder.java | 26 +++++++++
 7 files changed, 175 insertions(+), 2 deletions(-)
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/State.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateFactory.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
index f9fb981f79..364499265e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
@@ -85,6 +85,7 @@ public class PartitionRuntime implements Snapshotable {
             PartitionStreamReceiver>();
     private SiddhiAppContext siddhiAppContext;
     private MemoryUsageTracker memoryUsageTracker;
+    public static ThreadLocal<String> partitionKey= new ThreadLocal<>();
 
     public PartitionRuntime(ConcurrentMap<String, AbstractDefinition> streamDefinitionMap,
                             ConcurrentMap<String, AbstractDefinition> windowDefinitionMap,
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
index 838baae3ff..51f9b2ac6b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
@@ -269,8 +269,14 @@ public void receive(List<Event> events) {
 
     private void send(String key, ComplexEvent event) {
         if (key != null) {
-            partitionRuntime.cloneIfNotExist(key);
-            cachedStreamJunctionMap.get(streamId + key).sendEvent(event);
+            //todo fix partition
+            PartitionRuntime.partitionKey.set(key);
+            try {
+                partitionRuntime.cloneIfNotExist(key);
+                cachedStreamJunctionMap.get(streamId + key).sendEvent(event);
+            } finally {
+                PartitionRuntime.partitionKey.set(null);
+            }
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
new file mode 100644
index 0000000000..93ee2d77aa
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.util.snapshot.state;
+
+import io.siddhi.core.partition.PartitionRuntime;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PartitionStateHolder implements StateHolder {
+
+    private StateFactory stateFactory;
+    private Map<String, State> states = new HashMap<>();
+
+    public PartitionStateHolder(StateFactory stateFactory) {
+        this.stateFactory = stateFactory;
+    }
+
+    @Override
+    public State getState() {
+        String key = PartitionRuntime.partitionKey.get();
+        State state = states.get(key);
+        if (state == null) {
+            state = stateFactory.createNewState();
+            states.put(key, state);
+        }
+        return state;
+    }
+
+    @Override
+    public void returnState(State state) {
+        String key = PartitionRuntime.partitionKey.get();
+        if (state.canDestroy()) {
+            states.remove(key);
+        }
+    }
+
+
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
new file mode 100644
index 0000000000..03a5fa6c1d
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.util.snapshot.state;
+
+public class SingleStateHolder implements StateHolder {
+
+    private State state;
+
+    public SingleStateHolder(StateFactory stateFactory) {
+        state = stateFactory.createNewState();
+    }
+
+    @Override
+    public State getState() {
+        return state;
+    }
+
+    @Override
+    public void returnState(State state) {
+    }
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/State.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/State.java
new file mode 100644
index 0000000000..ed5e20bd9e
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/State.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.util.snapshot.state;
+
+public interface State {
+
+    boolean canDestroy();
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateFactory.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateFactory.java
new file mode 100644
index 0000000000..163c14537f
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateFactory.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.util.snapshot.state;
+
+public interface StateFactory {
+
+    State createNewState();
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
new file mode 100644
index 0000000000..f95c63ec24
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.util.snapshot.state;
+
+public interface StateHolder {
+
+    State getState();
+
+    void returnState(State state);
+}

From fc771aab8500d03fc2ee293c035341ecfbf7c505 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Thu, 21 Mar 2019 23:13:59 +0530
Subject: [PATCH 02/21] Add query state management, remove cloning, improve
 data storage format

Removing cloning of query and other Siddhi operations for partitioning
 and allow each Siddhi element to handle a collection of state based on
 partition and group id. This also allow each Siddhi element to clean
 it's state appropriately.

Making Siddhi to snapshot the data having partition and group ids as
the root elements, allowing easy data migration in the future.

Node: Though this implementation improve memory management it can
introduce performance degradation due to multiple hash map lookups.
---
 docs/documentation/siddhi-4.0.md              |   2 +-
 findbugs-exclude.xml                          |  16 +
 .../processor/SiddhiAnnotationProcessor.java  |   4 +-
 .../annotation/util/AnnotationConstants.java  |   4 +-
 .../java/io/siddhi/core/SiddhiAppRuntime.java |  23 +-
 .../core/aggregation/AggregationRuntime.java  |  47 +-
 .../BaseIncrementalValueStore.java            | 380 ++++++++--
 .../IncrementalAggregationProcessor.java      |  14 +-
 .../IncrementalDataAggregator.java            | 281 ++++++--
 .../core/aggregation/IncrementalExecutor.java | 294 ++++----
 ...mentalExternalTimestampDataAggregator.java | 227 ++++--
 .../siddhi/core/config/SiddhiAppContext.java  |  78 ++-
 .../core/config/SiddhiQueryContext.java       |  50 ++
 .../siddhi/core/debugger/SiddhiDebugger.java  |   4 +-
 .../holder/SnapshotableStreamEventQueue.java  |  14 +-
 .../executor/ConstantExpressionExecutor.java  |  10 -
 .../core/executor/ExpressionExecutor.java     |   4 -
 .../executor/VariableExpressionExecutor.java  |  10 -
 .../AndConditionExpressionExecutor.java       |  12 -
 .../BoolConditionExpressionExecutor.java      |  10 -
 .../InConditionExpressionExecutor.java        |  13 -
 .../IsNullConditionExpressionExecutor.java    |  10 -
 ...NullStreamConditionExpressionExecutor.java |  11 -
 .../NotConditionExpressionExecutor.java       |  10 -
 .../OrConditionExpressionExecutor.java        |  12 -
 .../CompareConditionExpressionExecutor.java   |   5 -
 ...reConditionExpressionExecutorBoolBool.java |   5 -
 ...nditionExpressionExecutorDoubleDouble.java |   5 -
 ...onditionExpressionExecutorDoubleFloat.java |   5 -
 ...eConditionExpressionExecutorDoubleInt.java |   6 -
 ...ConditionExpressionExecutorDoubleLong.java |   6 -
 ...onditionExpressionExecutorFloatDouble.java |   6 -
 ...ConditionExpressionExecutorFloatFloat.java |   5 -
 ...reConditionExpressionExecutorFloatInt.java |   6 -
 ...eConditionExpressionExecutorFloatLong.java |   6 -
 ...eConditionExpressionExecutorIntDouble.java |   6 -
 ...reConditionExpressionExecutorIntFloat.java |   6 -
 ...pareConditionExpressionExecutorIntInt.java |   6 -
 ...areConditionExpressionExecutorIntLong.java |   7 -
 ...ConditionExpressionExecutorLongDouble.java |   6 -
 ...eConditionExpressionExecutorLongFloat.java |   7 -
 ...areConditionExpressionExecutorLongInt.java |   7 -
 ...reConditionExpressionExecutorLongLong.java |   7 -
 ...nditionExpressionExecutorStringString.java |   6 -
 ...nditionExpressionExecutorDoubleDouble.java |   7 -
 ...onditionExpressionExecutorDoubleFloat.java |   7 -
 ...eConditionExpressionExecutorDoubleInt.java |   5 -
 ...ConditionExpressionExecutorDoubleLong.java |   5 -
 ...onditionExpressionExecutorFloatDouble.java |   6 -
 ...ConditionExpressionExecutorFloatFloat.java |   5 -
 ...reConditionExpressionExecutorFloatInt.java |   6 -
 ...eConditionExpressionExecutorFloatLong.java |   6 -
 ...eConditionExpressionExecutorIntDouble.java |   5 -
 ...reConditionExpressionExecutorIntFloat.java |   5 -
 ...pareConditionExpressionExecutorIntInt.java |   5 -
 ...areConditionExpressionExecutorIntLong.java |   6 -
 ...ConditionExpressionExecutorLongDouble.java |   5 -
 ...eConditionExpressionExecutorLongFloat.java |   6 -
 ...areConditionExpressionExecutorLongInt.java |   6 -
 ...reConditionExpressionExecutorLongLong.java |   5 -
 ...nditionExpressionExecutorDoubleDouble.java |   6 -
 ...onditionExpressionExecutorDoubleFloat.java |   5 -
 ...eConditionExpressionExecutorDoubleInt.java |   5 -
 ...ConditionExpressionExecutorDoubleLong.java |   5 -
 ...onditionExpressionExecutorFloatDouble.java |   6 -
 ...ConditionExpressionExecutorFloatFloat.java |   5 -
 ...reConditionExpressionExecutorFloatInt.java |   5 -
 ...eConditionExpressionExecutorFloatLong.java |   6 -
 ...eConditionExpressionExecutorIntDouble.java |   5 -
 ...reConditionExpressionExecutorIntFloat.java |   6 -
 ...pareConditionExpressionExecutorIntInt.java |   6 -
 ...areConditionExpressionExecutorIntLong.java |   5 -
 ...ConditionExpressionExecutorLongDouble.java |   5 -
 ...eConditionExpressionExecutorLongFloat.java |   5 -
 ...areConditionExpressionExecutorLongInt.java |   5 -
 ...reConditionExpressionExecutorLongLong.java |   5 -
 ...nditionExpressionExecutorDoubleDouble.java |   5 -
 ...onditionExpressionExecutorDoubleFloat.java |   5 -
 ...eConditionExpressionExecutorDoubleInt.java |   5 -
 ...ConditionExpressionExecutorDoubleLong.java |   5 -
 ...onditionExpressionExecutorFloatDouble.java |   5 -
 ...ConditionExpressionExecutorFloatFloat.java |   5 -
 ...reConditionExpressionExecutorFloatInt.java |   6 -
 ...eConditionExpressionExecutorFloatLong.java |   5 -
 ...eConditionExpressionExecutorIntDouble.java |   6 -
 ...reConditionExpressionExecutorIntFloat.java |   5 -
 ...pareConditionExpressionExecutorIntInt.java |   6 -
 ...areConditionExpressionExecutorIntLong.java |   5 -
 ...ConditionExpressionExecutorLongDouble.java |   5 -
 ...eConditionExpressionExecutorLongFloat.java |   5 -
 ...areConditionExpressionExecutorLongInt.java |   5 -
 ...reConditionExpressionExecutorLongLong.java |   5 -
 ...nditionExpressionExecutorDoubleDouble.java |   5 -
 ...onditionExpressionExecutorDoubleFloat.java |   5 -
 ...eConditionExpressionExecutorDoubleInt.java |   6 -
 ...ConditionExpressionExecutorDoubleLong.java |   5 -
 ...onditionExpressionExecutorFloatDouble.java |   6 -
 ...ConditionExpressionExecutorFloatFloat.java |   5 -
 ...reConditionExpressionExecutorFloatInt.java |   6 -
 ...eConditionExpressionExecutorFloatLong.java |   6 -
 ...eConditionExpressionExecutorIntDouble.java |   5 -
 ...reConditionExpressionExecutorIntFloat.java |   5 -
 ...pareConditionExpressionExecutorIntInt.java |   6 -
 ...areConditionExpressionExecutorIntLong.java |   5 -
 ...ConditionExpressionExecutorLongDouble.java |   5 -
 ...eConditionExpressionExecutorLongFloat.java |   5 -
 ...areConditionExpressionExecutorLongInt.java |   6 -
 ...reConditionExpressionExecutorLongLong.java |   6 -
 ...reConditionExpressionExecutorBoolBool.java |   5 -
 ...nditionExpressionExecutorDoubleDouble.java |   6 -
 ...onditionExpressionExecutorDoubleFloat.java |   5 -
 ...eConditionExpressionExecutorDoubleInt.java |   5 -
 ...ConditionExpressionExecutorDoubleLong.java |   5 -
 ...onditionExpressionExecutorFloatDouble.java |   5 -
 ...ConditionExpressionExecutorFloatFloat.java |   5 -
 ...reConditionExpressionExecutorFloatInt.java |   5 -
 ...eConditionExpressionExecutorFloatLong.java |   5 -
 ...eConditionExpressionExecutorIntDouble.java |   5 -
 ...reConditionExpressionExecutorIntFloat.java |   6 -
 ...pareConditionExpressionExecutorIntInt.java |   5 -
 ...areConditionExpressionExecutorIntLong.java |   5 -
 ...ConditionExpressionExecutorLongDouble.java |   5 -
 ...eConditionExpressionExecutorLongFloat.java |   5 -
 ...areConditionExpressionExecutorLongInt.java |   5 -
 ...reConditionExpressionExecutorLongLong.java |   5 -
 ...nditionExpressionExecutorStringString.java |   5 -
 .../function/CastFunctionExecutor.java        |  22 +-
 .../function/CoalesceFunctionExecutor.java    |  24 +-
 .../function/ConvertFunctionExecutor.java     |  24 +-
 .../function/CreateSetFunctionExecutor.java   |  23 +-
 .../CurrentTimeMillisFunctionExecutor.java    |  23 +-
 .../function/DefaultFunctionExecutor.java     |  23 +-
 .../EventTimestampFunctionExecutor.java       |  22 +-
 .../executor/function/FunctionExecutor.java   | 119 ++--
 .../function/IfThenElseFunctionExecutor.java  |  26 +-
 .../InstanceOfBooleanFunctionExecutor.java    |  22 +-
 .../InstanceOfDoubleFunctionExecutor.java     |  22 +-
 .../InstanceOfFloatFunctionExecutor.java      |  22 +-
 .../InstanceOfIntegerFunctionExecutor.java    |  22 +-
 .../InstanceOfLongFunctionExecutor.java       |  22 +-
 .../InstanceOfStringFunctionExecutor.java     |  22 +-
 .../function/MaximumFunctionExecutor.java     |  23 +-
 .../function/MinimumFunctionExecutor.java     |  23 +-
 .../function/ScriptFunctionExecutor.java      |  22 +-
 .../function/SizeOfSetFunctionExecutor.java   |  22 +-
 .../function/UUIDFunctionExecutor.java        |  21 +-
 ...ntalAggregateBaseTimeFunctionExecutor.java |  23 +-
 ...crementalShouldUpdateFunctionExecutor.java |  49 +-
 ...entalStartTimeEndTimeFunctionExecutor.java |  22 +-
 .../IncrementalTimeGetTimeZone.java           |  21 +-
 .../IncrementalUnixTimeFunctionExecutor.java  |  21 +-
 .../math/add/AddExpressionExecutorDouble.java |  12 -
 .../math/add/AddExpressionExecutorFloat.java  |  13 -
 .../math/add/AddExpressionExecutorInt.java    |  13 -
 .../math/add/AddExpressionExecutorLong.java   |  12 -
 .../DivideExpressionExecutorDouble.java       |  13 -
 .../divide/DivideExpressionExecutorFloat.java |  13 -
 .../divide/DivideExpressionExecutorInt.java   |  13 -
 .../divide/DivideExpressionExecutorLong.java  |  13 -
 .../math/mod/ModExpressionExecutorDouble.java |  14 -
 .../math/mod/ModExpressionExecutorFloat.java  |  14 -
 .../math/mod/ModExpressionExecutorInt.java    |  14 -
 .../math/mod/ModExpressionExecutorLong.java   |  14 -
 .../MultiplyExpressionExecutorDouble.java     |  14 -
 .../MultiplyExpressionExecutorFloat.java      |  14 -
 .../MultiplyExpressionExecutorInt.java        |  13 -
 .../MultiplyExpressionExecutorLong.java       |  14 -
 .../SubtractExpressionExecutorDouble.java     |  14 -
 .../SubtractExpressionExecutorFloat.java      |  14 -
 .../SubtractExpressionExecutorInt.java        |  14 -
 .../SubtractExpressionExecutorLong.java       |  13 -
 .../partition/PartitionInstanceRuntime.java   |  47 --
 .../core/partition/PartitionRuntime.java      | 312 ++++++---
 .../partition/PartitionStreamReceiver.java    |  39 +-
 .../core/query/FindStoreQueryRuntime.java     |   8 +-
 .../io/siddhi/core/query/QueryRuntime.java    |  59 +-
 .../input/MultiProcessStreamReceiver.java     |  52 +-
 .../query/input/ProcessStreamReceiver.java    |   7 -
 .../input/SingleProcessStreamReceiver.java    |  13 +-
 .../StateMultiProcessStreamReceiver.java      |   4 -
 .../query/input/stream/StreamRuntime.java     |   2 -
 .../input/stream/join/JoinProcessor.java      |  22 -
 .../input/stream/join/JoinStreamRuntime.java  |  43 --
 .../stream/single/EntryValveProcessor.java    |  18 -
 .../stream/single/SingleStreamRuntime.java    |  40 --
 .../AbsentLogicalPostStateProcessor.java      |   6 -
 .../state/AbsentLogicalPreStateProcessor.java | 450 ++++++------
 .../stream/state/AbsentPreStateProcessor.java |   4 +-
 .../state/AbsentStreamPostStateProcessor.java |   6 -
 .../state/AbsentStreamPreStateProcessor.java  | 284 ++++----
 .../stream/state/CountPostStateProcessor.java |   6 -
 .../stream/state/CountPreStateProcessor.java  | 103 ++-
 .../state/LogicalPostStateProcessor.java      |  13 -
 .../state/LogicalPreStateProcessor.java       |  93 ++-
 .../stream/state/PostStateProcessor.java      |   2 -
 .../input/stream/state/PreStateProcessor.java |   2 -
 .../stream/state/StateStreamRuntime.java      |  40 +-
 .../state/StreamPostStateProcessor.java       |  22 -
 .../stream/state/StreamPreStateProcessor.java | 252 ++++---
 .../PatternMultiProcessStreamReceiver.java    |   5 -
 .../PatternSingleProcessStreamReceiver.java   |   5 -
 .../SequenceMultiProcessStreamReceiver.java   |   9 -
 .../SequenceSingleProcessStreamReceiver.java  |   9 -
 .../state/runtime/CountInnerStateRuntime.java |  17 -
 .../state/runtime/EveryInnerStateRuntime.java |  19 +-
 .../state/runtime/InnerStateRuntime.java      |   3 +-
 .../runtime/LogicalInnerStateRuntime.java     |  53 +-
 .../state/runtime/NextInnerStateRuntime.java  |  38 +-
 .../runtime/StreamInnerStateRuntime.java      |  35 +-
 .../callback/InsertIntoStreamCallback.java    |   4 +-
 .../InsertIntoStreamEndPartitionCallback.java |  61 ++
 .../callback/InsertIntoWindowCallback.java    |   4 +-
 .../InsertIntoWindowEndPartitionCallback.java |  70 ++
 .../output/ratelimit/OutputRateLimiter.java   |  34 +-
 .../PassThroughOutputRateLimiter.java         |  19 +-
 .../event/AllPerEventOutputRateLimiter.java   |  84 ++-
 ...FirstGroupByPerEventOutputRateLimiter.java | 110 +--
 .../event/FirstPerEventOutputRateLimiter.java |  56 +-
 .../LastGroupByPerEventOutputRateLimiter.java |  90 ++-
 .../event/LastPerEventOutputRateLimiter.java  |  69 +-
 ...yWindowedPerSnapshotOutputRateLimiter.java | 165 +++--
 ...nWindowedPerSnapshotOutputRateLimiter.java | 107 +--
 ...yWindowedPerSnapshotOutputRateLimiter.java | 114 +--
 ...gregationPerSnapshotOutputRateLimiter.java |  99 +--
 .../GroupByPerSnapshotOutputRateLimiter.java  |  81 ++-
 .../PerSnapshotOutputRateLimiter.java         |  91 +--
 .../snapshot/SnapshotOutputRateLimiter.java   |  22 +-
 .../WindowedPerSnapshotOutputRateLimiter.java | 120 ++--
 .../WrappedSnapshotOutputRateLimiter.java     |  72 +-
 .../time/AllPerTimeOutputRateLimiter.java     |  92 +--
 .../FirstGroupByPerTimeOutputRateLimiter.java | 110 +--
 .../time/FirstPerTimeOutputRateLimiter.java   |  88 ++-
 .../LastGroupByPerTimeOutputRateLimiter.java  |  92 ++-
 .../time/LastPerTimeOutputRateLimiter.java    |  88 ++-
 .../core/query/processor/Processor.java       |  13 -
 .../processor/filter/FilterProcessor.java     |   9 -
 .../stream/AbstractStreamProcessor.java       | 117 +---
 .../processor/stream/LogStreamProcessor.java  |  35 +-
 .../processor/stream/StreamProcessor.java     |  14 +-
 .../Pol2CartStreamFunctionProcessor.java      |  33 +-
 .../function/StreamFunctionProcessor.java     |  25 +-
 .../window/AggregateWindowProcessor.java      |  59 +-
 .../stream/window/BatchWindowProcessor.java   | 133 ++--
 .../BatchingFindableWindowProcessor.java      |  98 +++
 .../window/BatchingWindowProcessor.java       |  42 +-
 .../stream/window/CronWindowProcessor.java    | 146 ++--
 .../stream/window/DelayWindowProcessor.java   |  79 ++-
 .../ExternalTimeBatchWindowProcessor.java     | 332 +++++----
 .../window/ExternalTimeWindowProcessor.java   |  78 ++-
 .../window/FrequentWindowProcessor.java       |  93 +--
 .../GroupingFindableWindowProcessor.java      |  98 +++
 .../window/GroupingWindowProcessor.java       |  30 +-
 .../stream/window/HopingWindowProcessor.java  |  27 +-
 .../window/LengthBatchWindowProcessor.java    | 207 +++---
 .../stream/window/LengthWindowProcessor.java  |  80 ++-
 .../window/LossyFrequentWindowProcessor.java  | 116 ++--
 .../stream/window/SessionWindowProcessor.java | 241 ++++---
 .../SlidingFindableWindowProcessor.java       |  97 +++
 .../stream/window/SlidingWindowProcessor.java |  34 +-
 .../stream/window/SortWindowProcessor.java    |  76 +-
 .../stream/window/TableWindowProcessor.java   |  54 +-
 .../window/TimeBatchWindowProcessor.java      | 148 ++--
 .../window/TimeLengthWindowProcessor.java     |  97 +--
 .../stream/window/TimeWindowProcessor.java    |  83 ++-
 .../stream/window/WindowProcessor.java        |  14 +-
 .../stream/window/WindowWindowProcessor.java  |  63 +-
 .../query/selector/GroupByKeyGenerator.java   |   6 -
 .../core/query/selector/QuerySelector.java    | 108 +--
 ...va => AndAttributeAggregatorExecutor.java} |  97 +--
 .../aggregator/AttributeAggregator.java       | 148 ----
 .../AttributeAggregatorExecutor.java          | 197 ++++++
 ...va => AvgAttributeAggregatorExecutor.java} | 145 ++--
 ... => CountAttributeAggregatorExecutor.java} |  80 ++-
 ...inctCountAttributeAggregatorExecutor.java} |  87 ++-
 ...va => MaxAttributeAggregatorExecutor.java} | 158 ++---
 ...axForeverAttributeAggregatorExecutor.java} | 169 +++--
 ...va => MinAttributeAggregatorExecutor.java} | 138 ++--
 ...inForeverAttributeAggregatorExecutor.java} | 150 ++--
 ...ava => OrAttributeAggregatorExecutor.java} |  82 ++-
 ...=> StdDevAttributeAggregatorExecutor.java} | 115 ++-
 ...va => SumAttributeAggregatorExecutor.java} | 118 ++--
 ... UnionSetAttributeAggregatorExecutor.java} | 112 +--
 .../processor/AttributeProcessor.java         |  10 -
 .../AbstractAggregationAttributeExecutor.java |  71 --
 .../AggregationAttributeExecutor.java         |  57 --
 .../GroupByAggregationAttributeExecutor.java  | 135 ----
 .../stream/input/source/InMemorySource.java   |  11 -
 .../core/stream/input/source/Source.java      |  15 +-
 .../stream/input/source/SourceHandler.java    |  54 +-
 .../stream/input/source/SourceMapper.java     |   5 +-
 .../core/stream/output/sink/InMemorySink.java |  11 -
 .../core/stream/output/sink/LogSink.java      |  11 -
 .../siddhi/core/stream/output/sink/Sink.java  |  20 +-
 .../core/stream/output/sink/SinkHandler.java  |  59 +-
 .../io/siddhi/core/table/InMemoryTable.java   | 103 +--
 .../siddhi/core/table/holder/EventHolder.java |   4 +-
 .../core/table/holder/IndexEventHolder.java   |  14 +-
 .../record/AbstractQueryableRecordTable.java  |   8 -
 .../table/record/AbstractRecordTable.java     |  12 +-
 .../core/table/record/RecordTableHandler.java | 110 ++-
 .../java/io/siddhi/core/trigger/Trigger.java  |   4 +-
 ...ementIdGenerator.java => IdGenerator.java} |   9 +-
 .../java/io/siddhi/core/util/Scheduler.java   | 291 ++++----
 .../core/util/SiddhiAppRuntimeBuilder.java    |   4 +-
 .../io/siddhi/core/util/SiddhiConstants.java  |   2 +
 .../operator/CollectionOperator.java          |   5 -
 .../operator/CompiledCondition.java           |   2 -
 .../operator/CompiledExpression.java          |   2 -
 .../operator/CompiledSelection.java           |   2 -
 .../operator/EventChunkOperator.java          |   5 -
 .../IncrementalAggregateCompileCondition.java |  64 +-
 .../collection/operator/IndexOperator.java    |   6 -
 .../util/collection/operator/MapOperator.java |   5 -
 .../SnapshotableEventQueueOperator.java       |   5 -
 .../AttributeAggregatorExtensionHolder.java   |   6 +-
 ...der.java => ExternalReferencedHolder.java} |   2 +-
 .../core/util/parser/AggregationParser.java   | 108 ++-
 .../core/util/parser/ExpressionParser.java    |  34 +-
 .../core/util/parser/InputStreamParser.java   |   2 +-
 .../util/parser/JoinInputStreamParser.java    |  12 +-
 .../siddhi/core/util/parser/OutputParser.java |  20 +-
 .../core/util/parser/PartitionParser.java     |   8 +-
 .../siddhi/core/util/parser/QueryParser.java  |  13 +-
 .../core/util/parser/SchedulerParser.java     |  11 +-
 .../core/util/parser/SelectorParser.java      |  14 +-
 .../core/util/parser/SiddhiAppParser.java     |  68 +-
 .../util/parser/SingleInputStreamParser.java  |  16 +-
 .../util/parser/StateInputStreamParser.java   |  39 +-
 .../core/util/parser/StoreQueryParser.java    |  25 +-
 .../parser/helper/DefinitionParserHelper.java |  12 +-
 ...IncrementalFileSystemPersistenceStore.java |   6 +-
 .../util/IncrementalSnapshotInfo.java         |  28 +-
 .../persistence/util/PersistenceHelper.java   |  39 +-
 .../core/util/snapshot/SnapshotService.java   | 657 +++++++++++-------
 .../core/util/snapshot/Snapshotable.java      |  51 --
 .../util/snapshot/state/EmptyStateHolder.java |  47 ++
 .../snapshot/state/PartitionStateHolder.java  |  59 +-
 .../snapshot/state/SingleStateHolder.java     |  68 +-
 .../{SnapshotState.java => Snapshot.java}     |   6 +-
 .../snapshot/state/SnapshotStateList.java     |  12 +-
 .../core/util/snapshot/state/State.java       |  16 +-
 .../util/snapshot/state/StateFactory.java     |   9 +-
 .../core/util/snapshot/state/StateHolder.java |  17 +-
 .../transport/MultiClientDistributedSink.java |  35 -
 .../SingleClientDistributedSink.java          |  23 -
 .../java/io/siddhi/core/window/Window.java    |  63 +-
 .../siddhi/core/ConcatFunctionExtension.java  |  22 +-
 .../aggregation/Aggregation1TestCase.java     |   9 +-
 .../SnapshotableEventQueueTestCase.java       |  46 +-
 .../io/siddhi/core/query/FilterTestCase2.java |   7 +-
 .../query/extension/ExtensionTestCase.java    |  10 +-
 .../util/CustomFunctionExtension.java         |  26 +-
 ...StringConcatAggregatorExecutorString.java} |  89 +--
 .../partition/JoinPartitionTestCase.java      |  68 +-
 .../query/partition/PartitionTestCase1.java   |  77 +-
 .../TimeOutputRateLimitTestCase.java          |   2 +-
 ...tAttributeAggregatorExecutorTestCase.java} |   4 +-
 ...vAttributeAggregatorExecutorTestCase.java} |   4 +-
 .../AttributeStreamFunction.java              |  23 +-
 .../window/TimeLengthWindowTestCase.java      |  14 +-
 .../core/stream/FaultFunctionExtension.java   |  25 +-
 .../core/stream/event/EventTestCase.java      |   6 +-
 .../siddhi-core/src/test/resources/testng.xml |   4 +-
 .../doc/gen/metadata/ExtensionType.java       |   4 +-
 .../query/input/stream/StateInputStream.java  |  29 +-
 .../sample/util/CustomFunctionExtension.java  |  44 +-
 366 files changed, 7632 insertions(+), 7331 deletions(-)
 delete mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionInstanceRuntime.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoStreamEndPartitionCallback.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoWindowEndPartitionCallback.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchingFindableWindowProcessor.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/GroupingFindableWindowProcessor.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SlidingFindableWindowProcessor.java
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{AndAttributeAggregator.java => AndAttributeAggregatorExecutor.java} (59%)
 delete mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregator.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{AvgAttributeAggregator.java => AvgAttributeAggregatorExecutor.java} (70%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{CountAttributeAggregator.java => CountAttributeAggregatorExecutor.java} (57%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{DistinctCountAttributeAggregator.java => DistinctCountAttributeAggregatorExecutor.java} (63%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{MaxAttributeAggregator.java => MaxAttributeAggregatorExecutor.java} (75%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{MaxForeverAttributeAggregator.java => MaxForeverAttributeAggregatorExecutor.java} (68%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{MinAttributeAggregator.java => MinAttributeAggregatorExecutor.java} (77%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{MinForeverAttributeAggregator.java => MinForeverAttributeAggregatorExecutor.java} (69%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{OrAttributeAggregator.java => OrAttributeAggregatorExecutor.java} (62%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{StdDevAttributeAggregator.java => StdDevAttributeAggregatorExecutor.java} (70%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{SumAttributeAggregator.java => SumAttributeAggregatorExecutor.java} (72%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/{UnionSetAttributeAggregator.java => UnionSetAttributeAggregatorExecutor.java} (64%)
 delete mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/AbstractAggregationAttributeExecutor.java
 delete mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/AggregationAttributeExecutor.java
 delete mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/GroupByAggregationAttributeExecutor.java
 rename modules/siddhi-core/src/main/java/io/siddhi/core/util/{ElementIdGenerator.java => IdGenerator.java} (79%)
 rename modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/{EternalReferencedHolder.java => ExternalReferencedHolder.java} (97%)
 delete mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/Snapshotable.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
 rename modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/{SnapshotState.java => Snapshot.java} (87%)
 rename modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/{StringConcatAggregatorString.java => StringConcatAggregatorExecutorString.java} (55%)
 rename modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/{DistinctCountAttributeAggregatorTestCase.java => DistinctCountAttributeAggregatorExecutorTestCase.java} (97%)
 rename modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/{StdDevAttributeAggregatorTestCase.java => StdDevAttributeAggregatorExecutorTestCase.java} (99%)

diff --git a/docs/documentation/siddhi-4.0.md b/docs/documentation/siddhi-4.0.md
index fd74c7ac6d..34f0dfbe18 100644
--- a/docs/documentation/siddhi-4.0.md
+++ b/docs/documentation/siddhi-4.0.md
@@ -2706,7 +2706,7 @@ Siddhi supports following extension types:
 
     For each event, it consumes zero or more parameters as input parameters and returns a single attribute with aggregated results. This can be used in conjunction with a window in order to find the aggregated results based on the given window like any Aggregate Function operation. 
     
-     This is implemented by extending `io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator`.
+     This is implemented by extending `io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregatorExecutor`.
 
     Example : 
     
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 9f1618f21a..81f8526d45 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -172,6 +172,22 @@
         <Class name="io.siddhi.core.table.holder.ListEventHolder"/>
         <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
     </Match>
+    <Match>
+        <Class name="io.siddhi.core.query.output.ratelimit.snapshot.AggregationGroupByWindowedPerSnapshotOutputRateLimiter"/>
+        <Bug pattern="BC_UNCONFIRMED_CAST"/>
+    </Match>
+    <Match>
+        <Class name="io.siddhi.core.query.processor.stream.window.DelayWindowProcessor"/>
+        <Bug pattern="BC_UNCONFIRMED_CAST"/>
+    </Match>
+    <Match>
+        <Class name="io.siddhi.core.query.processor.stream.window.SessionWindowProcessor"/>
+        <Bug pattern="DMI_ENTRY_SETS_MAY_REUSE_ENTRY_OBJECTS"/>
+    </Match>
+    <Match>
+        <Class name="io.siddhi.core.util.Scheduler$SchedulerState"/>
+        <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS"/>
+    </Match>
 
 
     <Match>
diff --git a/modules/siddhi-annotations/src/main/java/io/siddhi/annotation/processor/SiddhiAnnotationProcessor.java b/modules/siddhi-annotations/src/main/java/io/siddhi/annotation/processor/SiddhiAnnotationProcessor.java
index dbfde98a50..f40a15432b 100644
--- a/modules/siddhi-annotations/src/main/java/io/siddhi/annotation/processor/SiddhiAnnotationProcessor.java
+++ b/modules/siddhi-annotations/src/main/java/io/siddhi/annotation/processor/SiddhiAnnotationProcessor.java
@@ -79,7 +79,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                         AnnotationConstants.SINK_MAPPER_SUPER_CLASS,
                         AnnotationConstants.SINK_SUPER_CLASS,
                         AnnotationConstants.FUNCTION_EXECUTOR_SUPER_CLASS,
-                        AnnotationConstants.AGGREGATION_ATTRIBUTE_SUPER_CLASS,
+                        AnnotationConstants.AGGREGATION_ATTRIBUTE_EXECUTOR_SUPER_CLASS,
                         AnnotationConstants.DISTRIBUTION_STRATEGY_SUPER_CLASS,
                         AnnotationConstants.STREAM_PROCESSOR_SUPER_CLASS,
                         AnnotationConstants.STREAM_FUNCTION_PROCESSOR_SUPER_CLASS,
@@ -117,7 +117,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                             abstractAnnotationProcessor =
                                     new FunctionExecutorValidationAnnotationProcessor(extensionClassFullName);
                             break;
-                        case AnnotationConstants.AGGREGATION_ATTRIBUTE_SUPER_CLASS:
+                        case AnnotationConstants.AGGREGATION_ATTRIBUTE_EXECUTOR_SUPER_CLASS:
                             abstractAnnotationProcessor =
                                     new AggregationAttributeValidationAnnotationProcessor(extensionClassFullName);
                             break;
diff --git a/modules/siddhi-annotations/src/main/java/io/siddhi/annotation/util/AnnotationConstants.java b/modules/siddhi-annotations/src/main/java/io/siddhi/annotation/util/AnnotationConstants.java
index 6b3e486bb0..cfb6a72604 100644
--- a/modules/siddhi-annotations/src/main/java/io/siddhi/annotation/util/AnnotationConstants.java
+++ b/modules/siddhi-annotations/src/main/java/io/siddhi/annotation/util/AnnotationConstants.java
@@ -28,8 +28,8 @@ public class AnnotationConstants {
             "io.siddhi.core.function.Script";
     public static final String FUNCTION_EXECUTOR_SUPER_CLASS =
             "io.siddhi.core.executor.function.FunctionExecutor";
-    public static final String AGGREGATION_ATTRIBUTE_SUPER_CLASS =
-            "io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator";
+    public static final String AGGREGATION_ATTRIBUTE_EXECUTOR_SUPER_CLASS =
+            "io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregatorExecutor";
     public static final String DISTRIBUTION_STRATEGY_SUPER_CLASS =
             "io.siddhi.core.stream.output.sink.distributed.DistributionStrategy";
     public static final String STREAM_PROCESSOR_SUPER_CLASS =
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/SiddhiAppRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/SiddhiAppRuntime.java
index 87ead5f81b..9c2d8e5056 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/SiddhiAppRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/SiddhiAppRuntime.java
@@ -52,7 +52,7 @@
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.SiddhiConstants;
 import io.siddhi.core.util.StringUtil;
-import io.siddhi.core.util.extension.holder.EternalReferencedHolder;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 import io.siddhi.core.util.parser.StoreQueryParser;
 import io.siddhi.core.util.parser.helper.QueryParserHelper;
 import io.siddhi.core.util.persistence.util.PersistenceHelper;
@@ -243,7 +243,7 @@ public Set<String> getQueryNames() {
     public Map<String, Map<String, AbstractDefinition>> getPartitionedInnerStreamDefinitionMap() {
         Map<String, Map<String, AbstractDefinition>> innerStreams = new HashMap<>();
         for (PartitionRuntime partition : partitionMap.values()) {
-            innerStreams.put(partition.getElementId(), partition.getLocalStreamDefinitionMap());
+            innerStreams.put(partition.getPartitionName(), partition.getLocalStreamDefinitionMap());
         }
         return innerStreams;
     }
@@ -390,8 +390,9 @@ public synchronized void startWithoutSources() {
                 if (siddhiAppContext.isStatsEnabled() && siddhiAppContext.getStatisticsManager() != null) {
                     siddhiAppContext.getStatisticsManager().startReporting();
                 }
-                for (EternalReferencedHolder eternalReferencedHolder : siddhiAppContext.getEternalReferencedHolders()) {
-                    eternalReferencedHolder.start();
+                for (ExternalReferencedHolder externalReferencedHolder :
+                        siddhiAppContext.getExternalReferencedHolders()) {
+                    externalReferencedHolder.start();
                 }
                 for (List<Sink> sinks : sinkMap.values()) {
                     for (Sink sink : sinks) {
@@ -465,7 +466,7 @@ public synchronized void shutdown() {
                 try {
                     if (sourceHandlerManager != null) {
                         sourceHandlerManager.unregisterSourceHandler(source.getMapper().getHandler().
-                                getElementId());
+                                getId());
                     }
                     source.shutdown();
                 } catch (Throwable t) {
@@ -494,7 +495,7 @@ public synchronized void shutdown() {
             for (Sink sink : sinks) {
                 try {
                     if (sinkHandlerManager != null) {
-                        sinkHandlerManager.unregisterSinkHandler(sink.getHandler().getElementId());
+                        sinkHandlerManager.unregisterSinkHandler(sink.getHandler().getId());
                     }
                     sink.shutdown();
                 } catch (Throwable t) {
@@ -514,7 +515,7 @@ public synchronized void shutdown() {
                 String elementId = null;
                 RecordTableHandler recordTableHandler = table.getHandler();
                 if (recordTableHandler != null) {
-                    elementId = recordTableHandler.getElementId();
+                    elementId = recordTableHandler.getId();
                 }
                 if (elementId != null) {
                     recordTableHandlerManager.unregisterRecordTableHandler(elementId);
@@ -523,13 +524,13 @@ public synchronized void shutdown() {
             table.shutdown();
         }
 
-        for (EternalReferencedHolder eternalReferencedHolder : siddhiAppContext.getEternalReferencedHolders()) {
+        for (ExternalReferencedHolder externalReferencedHolder : siddhiAppContext.getExternalReferencedHolders()) {
             try {
-                eternalReferencedHolder.stop();
+                externalReferencedHolder.stop();
             } catch (Throwable t) {
                 log.error(StringUtil.removeCRLFCharacters(ExceptionUtil.getMessageWithContext(t, siddhiAppContext)) +
-                        " Error while stopping EternalReferencedHolder '" +
-                        StringUtil.removeCRLFCharacters(eternalReferencedHolder.toString()) + "' down Siddhi app '" +
+                        " Error while stopping ExternalReferencedHolder '" +
+                        StringUtil.removeCRLFCharacters(externalReferencedHolder.toString()) + "' down Siddhi app '" +
                         StringUtil.removeCRLFCharacters(siddhiAppContext.getName()) + "'.", t);
             }
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/AggregationRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/AggregationRuntime.java
index d1fff03c33..717e385029 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/AggregationRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/AggregationRuntime.java
@@ -18,7 +18,6 @@
 
 package io.siddhi.core.aggregation;
 
-import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.MetaStateEvent;
@@ -68,61 +67,61 @@ public class AggregationRuntime implements MemoryCalculable {
     private final AggregationDefinition aggregationDefinition;
     private final Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMap;
     private final Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMapForPartitions;
+    private final List<ExpressionExecutor> baseExecutorsForFind;
+    private ExpressionExecutor shouldUpdateTimestamp;
     private final Map<TimePeriod.Duration, Table> aggregationTables;
-    private final SiddhiAppContext siddhiAppContext;
     private final MetaStreamEvent tableMetaStreamEvent;
     private final MetaStreamEvent aggregateMetaSteamEvent;
     private final LatencyTracker latencyTrackerFind;
     private final ThroughputTracker throughputTrackerFind;
-    private final List<List<ExpressionExecutor>> aggregateProcessingExecutorsList;
     private final List<GroupByKeyGenerator> groupByKeyGeneratorList;
     private List<TimePeriod.Duration> incrementalDurations;
     private SingleStreamRuntime singleStreamRuntime;
-    private List<ExpressionExecutor> baseExecutors;
     private List<ExpressionExecutor> outputExpressionExecutors;
     private RecreateInMemoryData recreateInMemoryData;
     private boolean processingOnExternalTime;
     private boolean isFirstEventArrived;
     private long lastExecutorsRefreshedTime = -1;
     private IncrementalDataPurging incrementalDataPurging;
-    private ExpressionExecutor shouldUpdateExpressionExecutor;
     private String shardId;
+    private List<List<ExpressionExecutor>> aggregateProcessExpressionExecutorsListForFind;
 
     public AggregationRuntime(AggregationDefinition aggregationDefinition,
                               Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMap,
                               Map<TimePeriod.Duration, Table> aggregationTables,
                               SingleStreamRuntime singleStreamRuntime,
                               List<TimePeriod.Duration> incrementalDurations,
-                              SiddhiAppContext siddhiAppContext, List<ExpressionExecutor> baseExecutors,
                               MetaStreamEvent tableMetaStreamEvent,
                               List<ExpressionExecutor> outputExpressionExecutors,
                               LatencyTracker latencyTrackerFind, ThroughputTracker throughputTrackerFind,
                               RecreateInMemoryData recreateInMemoryData, boolean processingOnExternalTime,
-                              List<List<ExpressionExecutor>> aggregateProcessingExecutorsList,
                               List<GroupByKeyGenerator> groupByKeyGeneratorList,
                               IncrementalDataPurging incrementalDataPurging,
-                              ExpressionExecutor shouldUpdateExpressionExecutor, String shardId,
-                              Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMapForPartitions) {
+                              String shardId,
+                              Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMapForPartitions,
+                              ExpressionExecutor shouldUpdateTimestamp,
+                              List<List<ExpressionExecutor>> aggregateProcessExpressionExecutorsListForFind) {
         this.aggregationDefinition = aggregationDefinition;
         this.incrementalExecutorMap = incrementalExecutorMap;
         this.aggregationTables = aggregationTables;
         this.incrementalDurations = incrementalDurations;
-        this.siddhiAppContext = siddhiAppContext;
         this.singleStreamRuntime = singleStreamRuntime;
-        this.baseExecutors = baseExecutors;
         this.tableMetaStreamEvent = tableMetaStreamEvent;
         this.outputExpressionExecutors = outputExpressionExecutors;
         this.latencyTrackerFind = latencyTrackerFind;
         this.throughputTrackerFind = throughputTrackerFind;
         this.recreateInMemoryData = recreateInMemoryData;
         this.processingOnExternalTime = processingOnExternalTime;
-        this.aggregateProcessingExecutorsList = aggregateProcessingExecutorsList;
         this.groupByKeyGeneratorList = groupByKeyGeneratorList;
         this.incrementalDataPurging = incrementalDataPurging;
-        this.shouldUpdateExpressionExecutor = shouldUpdateExpressionExecutor;
         this.shardId = shardId;
         this.incrementalExecutorMapForPartitions = incrementalExecutorMapForPartitions;
-        aggregateMetaSteamEvent = new MetaStreamEvent();
+        this.shouldUpdateTimestamp = shouldUpdateTimestamp;
+        this.aggregateProcessExpressionExecutorsListForFind = aggregateProcessExpressionExecutorsListForFind;
+        this.aggregateMetaSteamEvent = new MetaStreamEvent();
+        //Without timestamp executor
+        this.baseExecutorsForFind = aggregateProcessExpressionExecutorsListForFind.get(0).subList(1,
+                aggregateProcessExpressionExecutorsListForFind.get(0).size());
         aggregationDefinition.getAttributeList().forEach(aggregateMetaSteamEvent::addOutputData);
     }
 
@@ -196,11 +195,11 @@ public SingleStreamRuntime getSingleStreamRuntime() {
         return singleStreamRuntime;
     }
 
-    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            SiddhiQueryContext siddhiQueryContext) {
         try {
-            SnapshotService.getSkipSnapshotableThreadLocal().set(true);
-            if (latencyTrackerFind != null && siddhiAppContext.isStatsEnabled()) {
+            SnapshotService.getSkipStateStorageThreadLocal().set(true);
+            if (latencyTrackerFind != null && siddhiQueryContext.getSiddhiAppContext().isStatsEnabled()) {
                 latencyTrackerFind.markIn();
                 throughputTrackerFind.eventIn();
             }
@@ -215,12 +214,13 @@ public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCond
             }
             return ((IncrementalAggregateCompileCondition) compiledCondition).find(matchingEvent,
                     aggregationDefinition, incrementalExecutorMap, aggregationTables, incrementalDurations,
-                    baseExecutors, outputExpressionExecutors, siddhiAppContext,
-                    aggregateProcessingExecutorsList, groupByKeyGeneratorList, shouldUpdateExpressionExecutor,
+                    baseExecutorsForFind, outputExpressionExecutors, siddhiQueryContext,
+                    aggregateProcessExpressionExecutorsListForFind,
+                    groupByKeyGeneratorList, shouldUpdateTimestamp,
                     incrementalExecutorMapForPartitions);
         } finally {
-            SnapshotService.getSkipSnapshotableThreadLocal().set(null);
-            if (latencyTrackerFind != null && siddhiAppContext.isStatsEnabled()) {
+            SnapshotService.getSkipStateStorageThreadLocal().set(null);
+            if (latencyTrackerFind != null && siddhiQueryContext.getSiddhiAppContext().isStatsEnabled()) {
                 latencyTrackerFind.markOut();
             }
         }
@@ -348,8 +348,7 @@ public CompiledCondition compileExpression(Expression expression, Within within,
         // "on stream1.name == aggregator.nickName ..." in the join query) must be executed on that data.
         // This condition is used for that purpose.
         onCompiledCondition = OperatorParser.constructOperator(new ComplexEventChunk<>(true), expression,
-                matchingMetaInfoHolder, variableExpressionExecutors, tableMap,
-                siddhiQueryContext);
+                matchingMetaInfoHolder, variableExpressionExecutors, tableMap, siddhiQueryContext);
 
         return new IncrementalAggregateCompileCondition(withinTableCompiledConditions, withinInMemoryCompileCondition,
                 onCompiledCondition, tableMetaStreamEvent, aggregateMetaSteamEvent, additionalAttributes,
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
index 832888e35b..36c0a70f33 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
@@ -19,12 +19,17 @@
 package io.siddhi.core.aggregation;
 
 import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.config.SiddhiQueryContext;
+import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.executor.ExpressionExecutor;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.executor.VariableExpressionExecutor;
+import io.siddhi.core.util.snapshot.state.PartitionStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,50 +38,56 @@
  * Store for maintaining the base values related to incremental aggregation. (e.g. for average,
  * the base incremental values would be sum and count. The timestamp too is stored here.
  */
-public class BaseIncrementalValueStore implements Snapshotable {
-    private long timestamp; // This is the starting timeStamp of aggregates
-    private Object[] values;
+public class BaseIncrementalValueStore {
+    private StateHolder<ValueState> valueStateHolder;
+    private StateHolder<StoreState> storeStateHolder;
     private List<ExpressionExecutor> expressionExecutors;
-    private boolean isProcessed = false;
     private StreamEventPool streamEventPool;
-    private String elementId;
-    private SiddhiAppContext siddhiAppContext;
-    private String aggregatorName;
-    private ExpressionExecutor shouldUpdateExpressionExecutor;
+    private ExpressionExecutor shouldUpdateTimestamp;
+    private long initialTimestamp;
 
-    public BaseIncrementalValueStore(long timeStamp, List<ExpressionExecutor> expressionExecutors,
+    public BaseIncrementalValueStore(List<ExpressionExecutor> expressionExecutors,
                                      StreamEventPool streamEventPool,
-                                     SiddhiAppContext siddhiAppContext, String aggregatorName,
-                                     ExpressionExecutor shouldUpdateExpressionExecutor) {
-        this.timestamp = timeStamp;
-        this.values = new Object[expressionExecutors.size() + 1];
+                                     SiddhiQueryContext siddhiQueryContext, String aggregatorName,
+                                     ExpressionExecutor shouldUpdateTimestamp, long initialTimestamp,
+                                     boolean groupBy, boolean local) {
         this.expressionExecutors = expressionExecutors;
         this.streamEventPool = streamEventPool;
-        this.siddhiAppContext = siddhiAppContext;
-        this.aggregatorName = aggregatorName;
-        this.shouldUpdateExpressionExecutor = shouldUpdateExpressionExecutor;
-        if (elementId == null) {
-            elementId = "IncrementalBaseStore-" + siddhiAppContext.getElementIdGenerator().createNewId();
-        }
-        if (aggregatorName != null) {
-            siddhiAppContext.getSnapshotService().addSnapshotable(aggregatorName, this);
+        this.shouldUpdateTimestamp = shouldUpdateTimestamp;
+        this.initialTimestamp = initialTimestamp;
+        if (!local) {
+            this.valueStateHolder = siddhiQueryContext.generateStateHolder(aggregatorName + "-" +
+                    this.getClass().getName() + "-value", groupBy, () -> new ValueState());
+            this.storeStateHolder = siddhiQueryContext.generateStateHolder(aggregatorName + "-" +
+                    this.getClass().getName(), false, () -> new StoreState());
+        } else {
+            this.valueStateHolder = new PartitionStateHolder(() -> new ValueState());
+            this.storeStateHolder = new SingleStateHolder(() -> new StoreState());
         }
     }
 
-    public void clearValues() {
-        this.values = new Object[expressionExecutors.size() + 1];
+    public void clearValues(long startTimeOfNewAggregates, StreamEvent resetEvent) {
+        this.initialTimestamp = startTimeOfNewAggregates;
+        setTimestamp(startTimeOfNewAggregates);
+        setProcessed(false);
+        Map<String, ValueState> states = this.valueStateHolder.getAllStates();
+        try {
+            for (ValueState storeState : states.values()) {
+                storeState.values = null;
+                storeState.lastTimestamp = 0;
+            }
+        } finally {
+            this.valueStateHolder.returnStates(states);
+        }
     }
 
     public void setValue(Object value, int position) {
-        values[position] = value;
-    }
-
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
+        ValueState state = this.valueStateHolder.getState();
+        try {
+            state.values[position] = value;
+        } finally {
+            this.valueStateHolder.returnState(state);
+        }
     }
 
     public List<ExpressionExecutor> getExpressionExecutors() {
@@ -84,66 +95,285 @@ public List<ExpressionExecutor> getExpressionExecutors() {
     }
 
     public boolean isProcessed() {
-        return isProcessed;
+        StoreState state = this.storeStateHolder.getState();
+        try {
+            return state.isProcessed;
+        } finally {
+            this.storeStateHolder.returnState(state);
+        }
     }
 
     public void setProcessed(boolean isProcessed) {
-        this.isProcessed = isProcessed;
+        StoreState state = this.storeStateHolder.getState();
+        try {
+            state.isProcessed = isProcessed;
+        } finally {
+            this.storeStateHolder.returnState(state);
+        }
     }
 
-    public StreamEvent createStreamEvent() {
-        StreamEvent streamEvent = streamEventPool.borrowEvent();
-        streamEvent.setTimestamp(timestamp);
-        setValue(timestamp, 0);
-        streamEvent.setOutputData(values);
-        return streamEvent;
+    private long getTimestamp() {
+        StoreState state = this.storeStateHolder.getState();
+        try {
+            return state.timestamp;
+        } finally {
+            this.storeStateHolder.returnState(state);
+        }
     }
 
-    public BaseIncrementalValueStore cloneStore(String key, long timestamp) {
-        List<ExpressionExecutor> newExpressionExecutors = new ArrayList<>(expressionExecutors.size());
-        expressionExecutors
-                .forEach(expressionExecutor -> newExpressionExecutors.add(expressionExecutor.cloneExecutor(key)));
-        ExpressionExecutor newShouldUpdateExpressionExecutor =
-                (shouldUpdateExpressionExecutor == null) ? null : shouldUpdateExpressionExecutor.cloneExecutor(key);
-        return new BaseIncrementalValueStore(timestamp, newExpressionExecutors, streamEventPool, siddhiAppContext,
-                aggregatorName, newShouldUpdateExpressionExecutor);
+    private void setTimestamp(long timestamp) {
+        StoreState state = this.storeStateHolder.getState();
+        try {
+            state.timestamp = timestamp;
+        } finally {
+            this.storeStateHolder.returnState(state);
+        }
     }
 
-    public ExpressionExecutor getShouldUpdateExpressionExecutor() {
-        return shouldUpdateExpressionExecutor;
+    public Map<String, StreamEvent> getGroupedByEvents() {
+        Map<String, StreamEvent> groupedByEvents = new HashMap<>();
+
+        if (isProcessed()) {
+            Map<String, ValueState> baseIncrementalValueStoreMap = this.valueStateHolder.getAllStates();
+            try {
+                for (Map.Entry<String, ValueState> state : baseIncrementalValueStoreMap.entrySet()) {
+                    StreamEvent streamEvent = streamEventPool.borrowEvent();
+                    long timestamp = getTimestamp();
+                    streamEvent.setTimestamp(timestamp);
+                    state.getValue().setValue(timestamp, 0);
+                    streamEvent.setOutputData(state.getValue().values);
+                    groupedByEvents.put(state.getKey(), streamEvent);
+                }
+            } finally {
+                this.valueStateHolder.returnStates(baseIncrementalValueStoreMap);
+            }
+        }
+        return groupedByEvents;
+    }
+
+    public ComplexEventChunk<StreamEvent> getProcessedEventChunk() {
+        ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(true);
+        Map<String, ValueState> baseIncrementalValueStoreMap = this.valueStateHolder.getAllStates();
+        try {
+            for (ValueState state : baseIncrementalValueStoreMap.values()) {
+                if (isProcessed()) {
+                    StreamEvent streamEvent = streamEventPool.borrowEvent();
+                    long timestamp = getTimestamp();
+                    streamEvent.setTimestamp(timestamp);
+                    state.setValue(timestamp, 0);
+                    streamEvent.setOutputData(state.values);
+                    streamEventChunk.add(streamEvent);
+                }
+            }
+        } finally {
+            this.valueStateHolder.returnStates(baseIncrementalValueStoreMap);
+        }
+        return streamEventChunk;
+    }
+
+//    public BaseIncrementalValueStore cloneStore(String key, long timestamp) {
+//        List<ExpressionExecutor> newExpressionExecutors = new ArrayList<>(expressionExecutors.size());
+//        expressionExecutors
+//                .forEach(expressionExecutor -> newExpressionExecutors.add(expressionExecutor.cloneExecutor(key)));
+//        ExpressionExecutor newShouldUpdateExpressionExecutor =
+//                (shouldUpdateExpressionExecutor == null) ? null : shouldUpdateExpressionExecutor.cloneExecutor(key);
+//        return new BaseIncrementalValueStore(newExpressionExecutors, streamEventPool, siddhiAppContext,
+//                aggregatorName, newShouldUpdateExpressionExecutor);
+//    }
+
+    public void process(StreamEvent streamEvent) {
+        ValueState state = valueStateHolder.getState();
+        try {
+            boolean shouldUpdate = true;
+            if (shouldUpdateTimestamp != null) {
+                shouldUpdate = (boolean) shouldUpdate(
+                        shouldUpdateTimestamp.execute(streamEvent), state);
+            }
+            for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
+                if (shouldUpdate) {
+                    ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+                    state.setValue(expressionExecutor.execute(streamEvent), i + 1);
+                } else {
+                    ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+                    if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
+                        state.setValue(expressionExecutor.execute(streamEvent), i + 1);
+                    }
+                }
+            }
+            setProcessed(true);
+        } finally {
+            valueStateHolder.returnState(state);
+        }
+//        List<ExpressionExecutor> expressionExecutors = baseIncrementalValueStore.getExpressionExecutors();
+//        boolean shouldUpdate = baseIncrementalValueStore.;
+//        if (shouldUpdateExpressionExecutor != null) {
+//            shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
+//        }
+//        baseIncrementalValueStore.setProcessed(true);
+//        for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
+//            if (shouldUpdate) {
+//                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+//                baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
+//            } else {
+//                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+//                if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
+//                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
+//                }
+//            }
+//        }
+    }
+
+    public void process(Map<String, StreamEvent> groupedByEvents) {
+        for (Map.Entry<String, StreamEvent> eventEntry : groupedByEvents.entrySet()) {
+            synchronized (this) {
+                SiddhiAppContext.startGroupByFlow(eventEntry.getKey() + "-" +
+                        eventEntry.getValue().getTimestamp());
+                ValueState state = valueStateHolder.getState();
+                try {
+                    boolean shouldUpdate = true;
+                    if (shouldUpdateTimestamp != null) {
+                        shouldUpdate = (boolean) shouldUpdate(
+                                shouldUpdateTimestamp.execute(eventEntry.getValue()), state);
+                    }
+                    for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
+                        if (shouldUpdate) {
+                            ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+                            state.setValue(expressionExecutor.execute(eventEntry.getValue()), i + 1);
+                        } else {
+                            ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+                            if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
+                                state.setValue(expressionExecutor.execute(eventEntry.getValue()), i + 1);
+                            }
+                        }
+                    }
+                    setProcessed(true);
+                } finally {
+                    valueStateHolder.returnState(state);
+                    SiddhiAppContext.stopGroupByFlow();
+                }
+            }
+        }
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("Timestamp", timestamp);
-        state.put("Values", values);
-        state.put("IsProcessed", isProcessed);
-        return state;
+    private Object shouldUpdate(Object data, ValueState state) {
+        long timestamp = (long) data;
+        if (timestamp >= state.lastTimestamp) {
+            state.lastTimestamp = timestamp;
+            return true;
+        }
+        return false;
     }
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        timestamp = (long) state.get("Timestamp");
-        values = (Object[]) state.get("Values");
-        isProcessed = (boolean) state.get("IsProcessed");
+    public Object shouldUpdate(Object data) {
+        ValueState state = this.valueStateHolder.getState();
+        try {
+            long timestamp = (long) data;
+            if (timestamp >= state.lastTimestamp) {
+                state.lastTimestamp = timestamp;
+                return true;
+            }
+            return false;
+        } finally {
+            this.valueStateHolder.returnState(state);
+        }
+
     }
 
-    @Override
-    public String getElementId() {
-        return elementId;
+//    public void process() {
+//        ValueStoreState state = this.stateHolder.getState();
+//        try {
+//            StreamEvent streamEvent = streamEventPool.borrowEvent();
+//            streamEvent.setTimestamp(state.timestamp);
+//            state.setValue(state.timestamp, 0);
+//            streamEvent.setOutputData(state.values);
+//
+//            boolean shouldUpdate = true;
+//            if (shouldUpdateExpressionExecutor != null) {
+//                shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
+//            }
+//
+//            for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
+//                if (shouldUpdate) {
+//                    ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+//                    state.setValue(expressionExecutor.execute(streamEvent), i + 1);
+//                } else {
+//                    ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+//                    if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
+//                        state.setValue(expressionExecutor.execute(streamEvent), i + 1);
+//                    }
+//                }
+//            }
+//            state.isProcessed = true;
+//        } finally {
+//            this.stateHolder.returnState(state);
+//        }
+//    }
+
+    class StoreState extends State {
+        private long timestamp;
+        private boolean isProcessed = false;
+
+        public StoreState() {
+            this.timestamp = initialTimestamp;
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return !isProcessed;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Timestamp", timestamp);
+            state.put("IsProcessed", isProcessed);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            timestamp = (long) state.get("Timestamp");
+            isProcessed = (boolean) state.get("IsProcessed");
+        }
+
+        public void setIfAbsentTimestamp(long timestamp) {
+            if (this.timestamp == -1) {
+                this.timestamp = timestamp;
+            }
+        }
     }
 
-    @Override
-    public void clean() {
-        for (ExpressionExecutor expressionExecutor : expressionExecutors) {
-            expressionExecutor.clean();
+    class ValueState extends State {
+        private Object[] values;
+        public long lastTimestamp = 0;
+
+        public ValueState() {
+            this.values = new Object[expressionExecutors.size() + 1];
         }
-        if (shouldUpdateExpressionExecutor != null) {
-            shouldUpdateExpressionExecutor.clean();
+
+        @Override
+        public boolean canDestroy() {
+            return values == null && lastTimestamp == 0;
         }
-        if (aggregatorName != null) {
-            siddhiAppContext.getSnapshotService().removeSnapshotable(aggregatorName, this);
+
+        public void setValue(Object value, int position) {
+            values[position] = value;
         }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Values", values);
+            state.put("LastTimestamp", lastTimestamp);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            values = (Object[]) state.get("Values");
+            lastTimestamp = (Long) state.get("LastTimestamp");
+        }
+
     }
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalAggregationProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalAggregationProcessor.java
index ec165fecc1..f98b12d040 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalAggregationProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalAggregationProcessor.java
@@ -31,6 +31,7 @@
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.statistics.LatencyTracker;
 import io.siddhi.core.util.statistics.ThroughputTracker;
+import org.apache.log4j.Logger;
 
 import java.util.List;
 
@@ -45,6 +46,7 @@ public class IncrementalAggregationProcessor implements Processor {
     private SiddhiAppContext siddhiAppContext;
     private AggregationRuntime aggregationRuntime;
     private boolean isFirstEventArrived;
+    private static final Logger log = Logger.getLogger(IncrementalAggregationProcessor.class);
 
     public IncrementalAggregationProcessor(AggregationRuntime aggregationRuntime,
                                            List<ExpressionExecutor> incomingExpressionExecutors,
@@ -115,16 +117,4 @@ public void setToLast(Processor processor) {
         throw new SiddhiAppCreationException("IncrementalAggregationProcessor does not support any " +
                 "next/last processor");
     }
-
-    @Override
-    public Processor cloneProcessor(String key) {
-        throw new SiddhiAppCreationException("IncrementalAggregationProcessor cannot be cloned");
-    }
-
-    @Override
-    public void clean() {
-        for (ExpressionExecutor expressionExecutor : incomingExpressionExecutors) {
-            expressionExecutor.clean();
-        }
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
index b9b75dd972..15f89df07a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
@@ -19,6 +19,7 @@
 package io.siddhi.core.aggregation;
 
 import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
@@ -26,11 +27,18 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.util.IncrementalTimeConverterUtil;
+import io.siddhi.core.util.parser.AggregationParser;
+import io.siddhi.core.util.snapshot.state.PartitionStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.aggregation.TimePeriod;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * This class implements the logic to aggregate data that is in-memory or in tables, in incremental data processing.
@@ -41,103 +49,228 @@
  */
 public class IncrementalDataAggregator {
     private final List<TimePeriod.Duration> incrementalDurations;
-    private final TimePeriod.Duration aggregateForDuration;
-    private final BaseIncrementalValueStore baseIncrementalValueStore;
-    private final Map<String, BaseIncrementalValueStore> baseIncrementalValueStoreGroupByMap;
+    private final TimePeriod.Duration durationToAggregate;
+    //    private final long oldestEventTimestamp;
+    private final List<ExpressionExecutor> baseExecutorsForFind;
+    //    private final BaseIncrementalValueStore baseIncrementalValueStore;
+//    private final ExpressionExecutor shouldUpdateExpressionExecutorForFind;
+    private final StateHolder valueStateHolder;
+    private final StreamEvent resetEvent;
+    private final long oldestEventTimestamp;
+    private ExpressionExecutor shouldUpdateTimestamp;
+    private final StreamEventPool streamEventPool;
+//    private long lastTimestamp = 0;
 
     public IncrementalDataAggregator(List<TimePeriod.Duration> incrementalDurations,
-                                     TimePeriod.Duration aggregateForDuration, long oldestEventTimeStamp,
-                                     List<ExpressionExecutor> baseExecutors,
-                                     MetaStreamEvent metaStreamEvent, SiddhiAppContext siddhiAppContext,
-                                     ExpressionExecutor shouldUpdateExpressionExecutor) {
+                                     TimePeriod.Duration durationToAggregate, long oldestEventTimestamp,
+                                     List<ExpressionExecutor> baseExecutorsForFind,
+                                     MetaStreamEvent metaStreamEvent, SiddhiQueryContext siddhiQueryContext,
+                                     ExpressionExecutor shouldUpdateTimestamp,
+                                     boolean groupBy) {
         this.incrementalDurations = incrementalDurations;
-        this.aggregateForDuration = aggregateForDuration;
-        StreamEventPool streamEventPool = new StreamEventPool(metaStreamEvent, 10);
-        this.baseIncrementalValueStore = new BaseIncrementalValueStore(oldestEventTimeStamp, baseExecutors,
-                streamEventPool, siddhiAppContext, null, shouldUpdateExpressionExecutor);
-        this.baseIncrementalValueStoreGroupByMap = new HashMap<>();
+        this.durationToAggregate = durationToAggregate;
+        this.oldestEventTimestamp = oldestEventTimestamp;
+        this.baseExecutorsForFind = baseExecutorsForFind;
+        streamEventPool = new StreamEventPool(metaStreamEvent, 10);
+        if (groupBy) {
+            this.valueStateHolder = new PartitionStateHolder(() -> new ValueState());
+        } else {
+            this.valueStateHolder = new SingleStateHolder(() -> new ValueState());
+        }
+        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
+
+//        this.values = new Object[baseExecutorsForFind.size() + 1];
+        this.shouldUpdateTimestamp = shouldUpdateTimestamp;
+//        this.baseIncrementalValueStore = new BaseIncrementalValueStore(baseExecutorsForFind,
+//                streamEventPool, siddhiQueryContext, null, shouldUpdateExpressionExecutorForFind,
+//                oldestEventTimestamp, groupBy, true);
+//        this.shouldUpdateExpressionExecutorForFind = shouldUpdateExpressionExecutorForFind;
+
+
     }
 
     public ComplexEventChunk<StreamEvent> aggregateInMemoryData(
             Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMap) {
-        int startIndex = incrementalDurations.indexOf(aggregateForDuration);
-        for (int i = startIndex; i >= 0; i--) {
-            TimePeriod.Duration duration = incrementalDurations.get(i);
+        int startIndex = incrementalDurations.indexOf(durationToAggregate);
+        Set<String> groupByKeys = new HashSet<>();
+        for (int k = startIndex; k >= 0; k--) {
+            TimePeriod.Duration duration = incrementalDurations.get(k);
             IncrementalExecutor incrementalExecutor = incrementalExecutorMap.get(duration);
 
-            BaseIncrementalValueStore baseIncrementalValueStore = incrementalExecutor.getBaseIncrementalValueStore();
-            Map<String, BaseIncrementalValueStore> baseIncrementalValueStoreGroupByMap = null;
-            if (incrementalExecutor.getBaseIncrementalValueStoreGroupByMap() != null) {
-                baseIncrementalValueStoreGroupByMap
-                        = new HashMap<>(incrementalExecutor.getBaseIncrementalValueStoreGroupByMap());
-            }
-            if (baseIncrementalValueStoreGroupByMap != null) {
-                for (Map.Entry<String, BaseIncrementalValueStore> entry :
-                        baseIncrementalValueStoreGroupByMap.entrySet()) {
-                    BaseIncrementalValueStore aBaseIncrementalValueStore = entry.getValue();
-                    if (aBaseIncrementalValueStore.isProcessed()) {
-                        processInMemoryAggregates(aBaseIncrementalValueStore.createStreamEvent(),
-                                aBaseIncrementalValueStore.getTimestamp(), entry.getKey());
+            BaseIncrementalValueStore aBaseIncrementalValueStore = incrementalExecutor.getBaseIncrementalValueStore();
+            Map<String, StreamEvent> groupedByEvents = aBaseIncrementalValueStore.getGroupedByEvents();
+//            process(groupedByEvents);
+//            baseIncrementalValueStore.process(groupedByEvents);
+
+//            Map<String, BaseIncrementalValueStore> baseIncrementalValueStoreGroupByMap = null;
+//            if (incrementalExecutor.getBaseIncrementalValueStoreGroupByMap() != null) {
+//                baseIncrementalValueStoreGroupByMap
+//                        = new HashMap<>(incrementalExecutor.getBaseIncrementalValueStoreGroupByMap());
+//            }
+//            if (baseIncrementalValueStoreGroupByMap != null) {
+//                for (Map.Entry<String, BaseIncrementalValueStore> entry :
+//                        baseIncrementalValueStoreGroupByMap.entrySet()) {
+//                    BaseIncrementalValueStore aBaseIncrementalValueStore = entry.getValue();
+//                    if (aBaseIncrementalValueStore.isProcessed()) {
+//                        processInMemoryAggregates(aBaseIncrementalValueStore.createStreamEvent(),
+//                                aBaseIncrementalValueStore.getTimestamp(), entry.getKey());
+//                    }
+//                }
+//            } else if (baseIncrementalValueStore.isProcessed()) {
+//            baseIncrementalValueStore.process(baseIncrementalValueStore.createStreamEvent(), )
+//                processInMemoryAggregates(baseIncrementalValueStore.createStreamEvent(),
+//                        baseIncrementalValueStore.getTimestamp(), null);
+//            }
+            for (Map.Entry<String, StreamEvent> eventEntry : groupedByEvents.entrySet()) {
+                long startTimeOfAggregates = IncrementalTimeConverterUtil.getStartTimeOfAggregates(
+                        eventEntry.getValue().getTimestamp(), durationToAggregate);
+                String groupByKey = eventEntry.getKey() + "-" + startTimeOfAggregates;
+                synchronized (this) {
+                    groupByKeys.add(groupByKey);
+                    SiddhiAppContext.startGroupByFlow(groupByKey);
+                    ValueState state = (ValueState) valueStateHolder.getState();
+                    try {
+                        boolean shouldUpdate = true;
+                        if (shouldUpdateTimestamp != null) {
+                            shouldUpdate = (boolean) shouldUpdate(
+                                    shouldUpdateTimestamp.execute(eventEntry.getValue()), state);
+                        } else {
+                            state.lastTimestamp = oldestEventTimestamp;
+                        }
+                        // keeping timestamp value location as null
+                        for (int i = 0; i < baseExecutorsForFind.size(); i++) {
+                            if (shouldUpdate) {
+                                ExpressionExecutor expressionExecutor = baseExecutorsForFind.get(i);
+                                state.setValue(expressionExecutor.execute(eventEntry.getValue()), i + 1);
+                            } else {
+                                ExpressionExecutor expressionExecutor = baseExecutorsForFind.get(i);
+                                if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
+                                    state.setValue(expressionExecutor.execute(eventEntry.getValue()), i + 1);
+                                }
+                            }
+                        }
+                    } finally {
+                        valueStateHolder.returnState(state);
+                        SiddhiAppContext.stopGroupByFlow();
                     }
                 }
-            } else if (baseIncrementalValueStore.isProcessed()) {
-                processInMemoryAggregates(baseIncrementalValueStore.createStreamEvent(),
-                        baseIncrementalValueStore.getTimestamp(), null);
             }
         }
-        return createEventChunkFromAggregatedData();
+//        shouldUpdateExpressionExecutorForFind.execute(streamEventPool.borrowEvent());
+        //clean all executors
+        for (String groupByKey : groupByKeys) {
+            SiddhiAppContext.startGroupByFlow(groupByKey);
+            try {
+                for (ExpressionExecutor expressionExecutor : baseExecutorsForFind) {
+                    expressionExecutor.execute(resetEvent);
+                }
+            } finally {
+                SiddhiAppContext.stopGroupByFlow();
+            }
+        }
+        return getProcessedEventChunk();
+//        return baseIncrementalValueStore.getProcessedEventChunk();
     }
 
-    private void processInMemoryAggregates(StreamEvent streamEvent, long timestamp, String groupByKey) {
-        long startTimeOfAggregates = IncrementalTimeConverterUtil.getStartTimeOfAggregates(timestamp,
-                aggregateForDuration);
-        synchronized (this) {
-            if (groupByKey != null) {
-                BaseIncrementalValueStore aBaseIncrementalValueStore =
-                        this.baseIncrementalValueStoreGroupByMap.computeIfAbsent(
-                                groupByKey, k -> baseIncrementalValueStore.cloneStore(k, startTimeOfAggregates));
-                process(streamEvent, aBaseIncrementalValueStore);
-            } else {
-                process(streamEvent, this.baseIncrementalValueStore);
+
+//    private void process(Map<String, StreamEvent> groupedByEvents) {
+//
+//    }
+
+    private ComplexEventChunk<StreamEvent> getProcessedEventChunk() {
+        ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(true);
+        Map<String, State> valueStoreMap = this.valueStateHolder.getAllStates();
+        try {
+            for (State aState : valueStoreMap.values()) {
+                ValueState state = (ValueState) aState;
+                StreamEvent streamEvent = streamEventPool.borrowEvent();
+                long timestamp = state.lastTimestamp;
+                streamEvent.setTimestamp(timestamp);
+                state.setValue(timestamp, 0);
+                streamEvent.setOutputData(state.values);
+                streamEventChunk.add(streamEvent);
             }
+        } finally {
+            this.valueStateHolder.returnStates(valueStoreMap);
         }
+        return streamEventChunk;
     }
 
-    private void process(StreamEvent streamEvent, BaseIncrementalValueStore baseIncrementalValueStore) {
-        List<ExpressionExecutor> expressionExecutors = baseIncrementalValueStore.getExpressionExecutors();
-        boolean shouldUpdate = true;
-        ExpressionExecutor shouldUpdateExpressionExecutor =
-                baseIncrementalValueStore.getShouldUpdateExpressionExecutor();
-        if (shouldUpdateExpressionExecutor != null) {
-            shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
-        }
 
-        for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
-            if (shouldUpdate) {
-                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-                baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-            } else {
-                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-                if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
-                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-                }
-            }
+    private Object shouldUpdate(Object data, ValueState state) {
+        long timestamp = (long) data;
+        if (timestamp >= state.lastTimestamp) {
+            state.lastTimestamp = timestamp;
+            return true;
         }
-        baseIncrementalValueStore.setProcessed(true);
+        return false;
     }
 
-    private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
-        ComplexEventChunk<StreamEvent> processedInMemoryEventChunk = new ComplexEventChunk<>(true);
-        if (this.baseIncrementalValueStoreGroupByMap.size() == 0) {
-            if (this.baseIncrementalValueStore.isProcessed()) {
-                processedInMemoryEventChunk.add(this.baseIncrementalValueStore.createStreamEvent());
-            }
-        } else {
-            for (Map.Entry<String, BaseIncrementalValueStore> entryAgainstGroupBy :
-                    baseIncrementalValueStoreGroupByMap.entrySet()) {
-                processedInMemoryEventChunk.add(entryAgainstGroupBy.getValue().createStreamEvent());
-            }
+//    private void processInMemoryAggregates(StreamEvent streamEvent, long timestamp, String groupByKey) {
+//        long startTimeOfAggregates = IncrementalTimeConverterUtil.getStartTimeOfAggregates(timestamp,
+//                durationToAggregate);
+//        synchronized (this) {
+//            if (groupByKey != null) {
+//
+//                BaseIncrementalValueStore aBaseIncrementalValueStore =
+//                        this.baseIncrementalValueStoreGroupByMap.computeIfAbsent(
+//                                groupByKey, k -> baseIncrementalValueStore.cloneStore(k, startTimeOfAggregates));
+//                process(streamEvent, aBaseIncrementalValueStore, startTimeOfAggregates);
+//            } else {
+//                baseIncrementalValueStore.process(streamEvent, startTimeOfAggregates);
+//                process(streamEvent, this.baseIncrementalValueStore, startTimeOfAggregates);
+//            }
+//        }
+//    }
+
+
+//    private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
+//        ComplexEventChunk<StreamEvent> processedInMemoryEventChunk = new ComplexEventChunk<>(true);
+//        baseIncrementalValueStore
+//        if (this.baseIncrementalValueStoreGroupByMap.size() == 0) {
+//            if (this.baseIncrementalValueStore.isProcessed()) {
+//                processedInMemoryEventChunk.add(this.baseIncrementalValueStore.createStreamEvent());
+//            }
+//        } else {
+//            for (Map.Entry<String, BaseIncrementalValueStore> entryAgainstGroupBy :
+//                    baseIncrementalValueStoreGroupByMap.entrySet()) {
+//                processedInMemoryEventChunk.add(entryAgainstGroupBy.getValue().createStreamEvent());
+//            }
+//        }
+//        return processedInMemoryEventChunk;
+//    }
+
+    class ValueState extends State {
+        private Object[] values;
+        public long lastTimestamp;
+
+        public ValueState() {
+            this.lastTimestamp = 0;
+            this.values = new Object[baseExecutorsForFind.size() + 1];
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return values == null && lastTimestamp == 0;
         }
-        return processedInMemoryEventChunk;
+
+        public void setValue(Object value, int position) {
+            values[position] = value;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Values", values);
+            state.put("LastTimestamp", lastTimestamp);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            values = (Object[]) state.get("Values");
+            lastTimestamp = (Long) state.get("LastTimestamp");
+        }
+
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
index 0f59048429..121fc9e871 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
@@ -19,19 +19,20 @@
 package io.siddhi.core.aggregation;
 
 import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.executor.ExpressionExecutor;
-import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.query.selector.GroupByKeyGenerator;
-import io.siddhi.core.query.selector.attribute.processor.executor.GroupByAggregationAttributeExecutor;
 import io.siddhi.core.table.Table;
 import io.siddhi.core.util.IncrementalTimeConverterUtil;
 import io.siddhi.core.util.Scheduler;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.parser.AggregationParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.aggregation.TimePeriod;
 import org.apache.log4j.Logger;
 
@@ -42,64 +43,51 @@
 /**
  * Incremental executor class which is responsible for performing incremental aggregation.
  */
-public class IncrementalExecutor implements Executor, Snapshotable {
+public class IncrementalExecutor implements Executor {
     private static final Logger LOG = Logger.getLogger(IncrementalExecutor.class);
 
     private final StreamEvent resetEvent;
     private final ExpressionExecutor timestampExpressionExecutor;
     private final String aggregatorName;
+    private final StateHolder<ExecutorState> stateHolder;
     private TimePeriod.Duration duration;
     private Table table;
     private GroupByKeyGenerator groupByKeyGenerator;
     private StreamEventPool streamEventPool;
-    private long nextEmitTime = -1;
-    private long startTimeOfAggregates = -1;
-    private boolean timerStarted = false;
-    private boolean isGroupBy;
+    //    private boolean groupBy;
     private Executor next;
     private Scheduler scheduler;
     private boolean isRoot;
-    private String elementId;
     private boolean isProcessingExecutor;
-    private SiddhiAppContext siddhiAppContext;
+    private SiddhiQueryContext siddhiQueryContext;
 
     private BaseIncrementalValueStore baseIncrementalValueStore = null;
-    private Map<String, BaseIncrementalValueStore> baseIncrementalValueStoreGroupByMap = null;
 
     public IncrementalExecutor(TimePeriod.Duration duration, List<ExpressionExecutor> processExpressionExecutors,
                                GroupByKeyGenerator groupByKeyGenerator, MetaStreamEvent metaStreamEvent,
                                IncrementalExecutor child, boolean isRoot, Table table,
-                               SiddhiAppContext siddhiAppContext, String aggregatorName,
-                               ExpressionExecutor shouldUpdateExpressionExecutor) {
+                               SiddhiQueryContext siddhiQueryContext, String aggregatorName,
+                               ExpressionExecutor shouldUpdateTimestamp) {
         this.duration = duration;
         this.next = child;
         this.isRoot = isRoot;
         this.table = table;
-        this.siddhiAppContext = siddhiAppContext;
+        this.siddhiQueryContext = siddhiQueryContext;
         this.aggregatorName = aggregatorName;
         this.streamEventPool = new StreamEventPool(metaStreamEvent, 10);
         this.timestampExpressionExecutor = processExpressionExecutors.remove(0);
-        this.baseIncrementalValueStore = new BaseIncrementalValueStore(-1, processExpressionExecutors,
-                streamEventPool, siddhiAppContext, aggregatorName, shouldUpdateExpressionExecutor);
         this.isProcessingExecutor = false;
-
-        if (groupByKeyGenerator != null) {
-            this.isGroupBy = true;
-            this.groupByKeyGenerator = groupByKeyGenerator;
-            this.baseIncrementalValueStoreGroupByMap = new HashMap<>();
-        } else {
-            this.isGroupBy = false;
-        }
-
-        this.resetEvent = streamEventPool.borrowEvent();
-        this.resetEvent.setType(ComplexEvent.Type.RESET);
+//        if (groupByKeyGenerator != null) {
+//            this.groupBy = true;
+        this.groupByKeyGenerator = groupByKeyGenerator;
+//        }
+        this.baseIncrementalValueStore = new BaseIncrementalValueStore(processExpressionExecutors, streamEventPool,
+                siddhiQueryContext, aggregatorName, shouldUpdateTimestamp, -1, true, false);
+        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
         setNextExecutor(child);
 
-        if (elementId == null) {
-            elementId = "IncrementalExecutor-" + siddhiAppContext.getElementIdGenerator().createNewId();
-        }
-        siddhiAppContext.getSnapshotService().addSnapshotable(aggregatorName, this);
-
+        this.stateHolder = siddhiQueryContext.generateStateHolder(
+                aggregatorName + "-" + this.getClass().getName(), false, () -> new ExecutorState());
     }
 
     public void setScheduler(Scheduler scheduler) {
@@ -116,40 +104,44 @@ public void execute(ComplexEventChunk streamEventChunk) {
         while (streamEventChunk.hasNext()) {
             StreamEvent streamEvent = (StreamEvent) streamEventChunk.next();
             streamEventChunk.remove();
-
-            long timestamp = getTimestamp(streamEvent);
-
-            startTimeOfAggregates = IncrementalTimeConverterUtil.getStartTimeOfAggregates(timestamp, duration);
-
-            if (timestamp >= nextEmitTime) {
-                nextEmitTime = IncrementalTimeConverterUtil.getNextEmitTime(timestamp, duration, null);
-                dispatchAggregateEvents(startTimeOfAggregates);
-                sendTimerEvent();
-            }
-            if (streamEvent.getType() == ComplexEvent.Type.CURRENT) {
-                processAggregates(streamEvent);
+            ExecutorState executorState = stateHolder.getState();
+            try {
+                long timestamp = getTimestamp(streamEvent, executorState);
+                executorState.startTimeOfAggregates = IncrementalTimeConverterUtil.getStartTimeOfAggregates(
+                        timestamp, duration);
+                if (timestamp >= executorState.nextEmitTime) {
+                    executorState.nextEmitTime = IncrementalTimeConverterUtil.getNextEmitTime(
+                            timestamp, duration, null);
+                    dispatchAggregateEvents(executorState.startTimeOfAggregates);
+                    sendTimerEvent(executorState);
+                }
+                if (streamEvent.getType() == ComplexEvent.Type.CURRENT) {
+                    processAggregates(streamEvent, executorState);
+                }
+            } finally {
+                stateHolder.returnState(executorState);
             }
         }
     }
 
-    private void sendTimerEvent() {
+    private void sendTimerEvent(ExecutorState executorState) {
         if (getNextExecutor() != null) {
             StreamEvent timerEvent = streamEventPool.borrowEvent();
             timerEvent.setType(ComplexEvent.Type.TIMER);
-            timerEvent.setTimestamp(startTimeOfAggregates);
+            timerEvent.setTimestamp(executorState.startTimeOfAggregates);
             ComplexEventChunk<StreamEvent> timerStreamEventChunk = new ComplexEventChunk<>(true);
             timerStreamEventChunk.add(timerEvent);
             next.execute(timerStreamEventChunk);
         }
     }
 
-    private long getTimestamp(StreamEvent streamEvent) {
+    private long getTimestamp(StreamEvent streamEvent, ExecutorState executorState) {
         long timestamp;
         if (streamEvent.getType() == ComplexEvent.Type.CURRENT) {
             timestamp = (long) timestampExpressionExecutor.execute(streamEvent);
-            if (isRoot && !timerStarted) {
+            if (isRoot && !executorState.timerStarted) {
                 scheduler.notifyAt(IncrementalTimeConverterUtil.getNextEmitTime(timestamp, duration, null));
-                timerStarted = true;
+                executorState.timerStarted = true;
             }
         } else {
             timestamp = streamEvent.getTimestamp();
@@ -171,66 +163,49 @@ public void setNextExecutor(Executor nextExecutor) {
         next = nextExecutor;
     }
 
-    private void processAggregates(StreamEvent streamEvent) {
+    private void processAggregates(StreamEvent streamEvent, ExecutorState executorState) {
         synchronized (this) {
-            if (isGroupBy) {
+            if (groupByKeyGenerator != null) {
                 try {
                     String groupedByKey = groupByKeyGenerator.constructEventKey(streamEvent);
-                    GroupByAggregationAttributeExecutor.getKeyThreadLocal().set(groupedByKey);
-                    BaseIncrementalValueStore aBaseIncrementalValueStore = baseIncrementalValueStoreGroupByMap
-                            .computeIfAbsent(groupedByKey,
-                                    k -> baseIncrementalValueStore.cloneStore(k, startTimeOfAggregates));
-                    process(streamEvent, aBaseIncrementalValueStore);
+                    SiddhiAppContext.startGroupByFlow(groupedByKey);
+//                    GroupByAggregationAttributeExecutor.getKeyThreadLocal().set(groupedByKey);
+                    baseIncrementalValueStore.process(streamEvent);
+//                    process(streamEvent, baseIncrementalValueStore);
                 } finally {
-                    GroupByAggregationAttributeExecutor.getKeyThreadLocal().remove();
+                    SiddhiAppContext.stopGroupByFlow();
+//                    GroupByAggregationAttributeExecutor.getKeyThreadLocal().remove();
                 }
             } else {
-                process(streamEvent, baseIncrementalValueStore);
-            }
-        }
-    }
-
-    private void process(StreamEvent streamEvent, BaseIncrementalValueStore baseIncrementalValueStore) {
-        List<ExpressionExecutor> expressionExecutors = baseIncrementalValueStore.getExpressionExecutors();
-        boolean shouldUpdate = true;
-        ExpressionExecutor shouldUpdateExpressionExecutor =
-                baseIncrementalValueStore.getShouldUpdateExpressionExecutor();
-        if (shouldUpdateExpressionExecutor != null) {
-            shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
-        }
+                baseIncrementalValueStore.process(streamEvent);
 
-        for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
-            if (shouldUpdate) {
-                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-                baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-            } else {
-                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-                if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
-                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-                }
+//                process(streamEvent, baseIncrementalValueStore);
             }
         }
-        baseIncrementalValueStore.setProcessed(true);
     }
 
+
     private void dispatchAggregateEvents(long startTimeOfNewAggregates) {
-        if (isGroupBy) {
-            dispatchEvents(baseIncrementalValueStoreGroupByMap);
-        } else {
-            dispatchEvent(startTimeOfNewAggregates, baseIncrementalValueStore);
-        }
+//        if (groupBy) {
+//        dispatchEvent(startTimeOfNewAggregates, baseIncrementalValueStore);
+//            dispatchEvents(baseIncrementalValueStoreGroupByMap);
+//        } else {
+        dispatchEvent(startTimeOfNewAggregates, baseIncrementalValueStore);
+//        }
     }
 
     private void dispatchEvent(long startTimeOfNewAggregates, BaseIncrementalValueStore aBaseIncrementalValueStore) {
         if (aBaseIncrementalValueStore.isProcessed()) {
-            StreamEvent streamEvent = aBaseIncrementalValueStore.createStreamEvent();
+            Map<String, StreamEvent> streamEventMap = aBaseIncrementalValueStore.getGroupedByEvents();
             ComplexEventChunk<StreamEvent> eventChunk = new ComplexEventChunk<>(true);
-            eventChunk.add(streamEvent);
+            for (StreamEvent event : streamEventMap.values()) {
+                eventChunk.add(event);
+            }
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Event dispatched by " + this.duration + " incremental executor: " + eventChunk.toString());
             }
             if (isProcessingExecutor) {
-                table.addEvents(eventChunk, 1);
+                table.addEvents(eventChunk, streamEventMap.size());
             }
             if (getNextExecutor() != null) {
                 next.execute(eventChunk);
@@ -239,59 +214,73 @@ private void dispatchEvent(long startTimeOfNewAggregates, BaseIncrementalValueSt
         cleanBaseIncrementalValueStore(startTimeOfNewAggregates, aBaseIncrementalValueStore);
     }
 
-    private void dispatchEvents(Map<String, BaseIncrementalValueStore> baseIncrementalValueGroupByStore) {
-        int noOfEvents = baseIncrementalValueGroupByStore.size();
-        if (noOfEvents > 0) {
-            ComplexEventChunk<StreamEvent> eventChunk = new ComplexEventChunk<>(true);
-            for (BaseIncrementalValueStore aBaseIncrementalValueStore : baseIncrementalValueGroupByStore.values()) {
-                StreamEvent streamEvent = aBaseIncrementalValueStore.createStreamEvent();
-                eventChunk.add(streamEvent);
-            }
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Event dispatched by " + this.duration + " incremental executor: " + eventChunk.toString());
-            }
-            if (isProcessingExecutor) {
-                table.addEvents(eventChunk, noOfEvents);
-            }
-            if (getNextExecutor() != null) {
-                next.execute(eventChunk);
-            }
-        }
-        for (BaseIncrementalValueStore baseIncrementalValueStore : baseIncrementalValueGroupByStore.values()) {
-            baseIncrementalValueStore.clean();
-        }
-        baseIncrementalValueGroupByStore.clear();
-    }
+//    private void dispatchEvents(Map<String, BaseIncrementalValueStore> baseIncrementalValueGroupByStore) {
+//        int noOfEvents = baseIncrementalValueGroupByStore.size();
+//        if (noOfEvents > 0) {
+//            ComplexEventChunk<StreamEvent> eventChunk = new ComplexEventChunk<>(true);
+//            for (BaseIncrementalValueStore aBaseIncrementalValueStore : baseIncrementalValueGroupByStore.values()) {
+//                StreamEvent streamEvent = aBaseIncrementalValueStore.createStreamEvent();
+//                eventChunk.add(streamEvent);
+//            }
+//            if (LOG.isDebugEnabled()) {
+//                LOG.debug("Event dispatched by " + this.duration + " incremental executor: " + eventChunk.toString());
+//            }
+//            if (isProcessingExecutor) {
+//                table.addEvents(eventChunk, noOfEvents);
+//            }
+//            if (getNextExecutor() != null) {
+//                next.execute(eventChunk);
+//            }
+//        }
+//        for (BaseIncrementalValueStore baseIncrementalValueStore : baseIncrementalValueGroupByStore.values()) {
+//            baseIncrementalValueStore.clean();
+//        }
+//        baseIncrementalValueGroupByStore.clear();
+//    }
 
     private void cleanBaseIncrementalValueStore(long startTimeOfNewAggregates,
                                                 BaseIncrementalValueStore baseIncrementalValueStore) {
-        baseIncrementalValueStore.clearValues();
-        baseIncrementalValueStore.setTimestamp(startTimeOfNewAggregates);
-        baseIncrementalValueStore.setProcessed(false);
+        baseIncrementalValueStore.clearValues(startTimeOfNewAggregates, resetEvent);
+//        baseIncrementalValueStore.setProcessed(false);
         for (ExpressionExecutor expressionExecutor : baseIncrementalValueStore.getExpressionExecutors()) {
             expressionExecutor.execute(resetEvent);
         }
     }
 
 
-    Map<String, BaseIncrementalValueStore> getBaseIncrementalValueStoreGroupByMap() {
-        return baseIncrementalValueStoreGroupByMap;
-    }
+//    Map<String, BaseIncrementalValueStore> getBaseIncrementalValueStoreGroupByMap() {
+//        return baseIncrementalValueStoreGroupByMap;
+//    }
 
     BaseIncrementalValueStore getBaseIncrementalValueStore() {
         return baseIncrementalValueStore;
     }
 
     public long getAggregationStartTimestamp() {
-        return this.startTimeOfAggregates;
+        ExecutorState state = stateHolder.getState();
+        try {
+            return state.startTimeOfAggregates;
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     public long getNextEmitTime() {
-        return nextEmitTime;
+        ExecutorState state = stateHolder.getState();
+        try {
+            return state.nextEmitTime;
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     public void setValuesForInMemoryRecreateFromTable(long emitTimeOfLatestEventInTable) {
-        this.nextEmitTime = emitTimeOfLatestEventInTable;
+        ExecutorState state = stateHolder.getState();
+        try {
+            state.nextEmitTime = emitTimeOfLatestEventInTable;
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     public boolean isProcessingExecutor() {
@@ -303,45 +292,44 @@ public void setProcessingExecutor(boolean processingExecutor) {
     }
 
     public void clearExecutor() {
-        if (isGroupBy) {
-            this.baseIncrementalValueStoreGroupByMap.clear();
-        } else {
-            cleanBaseIncrementalValueStore(-1, this.baseIncrementalValueStore);
-        }
+//        if (groupBy) {
+//            this.baseIncrementalValueStoreGroupByMap.clear();
+//        } else {
+//        if (!groupBy) {
+        cleanBaseIncrementalValueStore(-1, this.baseIncrementalValueStore);
+//        }
+//        }
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
+    class ExecutorState extends State {
+        private long nextEmitTime = -1;
+        private long startTimeOfAggregates = -1;
+        private boolean timerStarted = false;
+        private boolean canDestroy = false;
 
-        state.put("NextEmitTime", nextEmitTime);
-        state.put("StartTimeOfAggregates", startTimeOfAggregates);
-        state.put("TimerStarted", timerStarted);
-        return state;
-    }
+        @Override
+        public boolean canDestroy() {
+            return canDestroy;
+        }
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        nextEmitTime = (long) state.get("NextEmitTime");
-        startTimeOfAggregates = (long) state.get("StartTimeOfAggregates");
-        timerStarted = (boolean) state.get("TimerStarted");
-    }
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("NextEmitTime", nextEmitTime);
+            state.put("StartTimeOfAggregates", startTimeOfAggregates);
+            state.put("TimerStarted", timerStarted);
+            return state;
+        }
 
-    @Override
-    public String getElementId() {
-        return elementId;
-    }
+        @Override
+        public void restore(Map<String, Object> state) {
+            nextEmitTime = (long) state.get("NextEmitTime");
+            startTimeOfAggregates = (long) state.get("StartTimeOfAggregates");
+            timerStarted = (boolean) state.get("TimerStarted");
+        }
 
-    @Override
-    public void clean() {
-        timestampExpressionExecutor.clean();
-        baseIncrementalValueStore.clean();
-        scheduler.clean();
-        if (baseIncrementalValueStoreGroupByMap != null) {
-            for (BaseIncrementalValueStore aBaseIncrementalValueStore : baseIncrementalValueStoreGroupByMap.values()) {
-                aBaseIncrementalValueStore.clean();
-            }
+        public void setCanDestroy(boolean canDestroy) {
+            this.canDestroy = canDestroy;
         }
-        siddhiAppContext.getSnapshotService().removeSnapshotable(aggregatorName, this);
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
index 92b88ee3fe..ab38d4142e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
@@ -18,6 +18,7 @@
 package io.siddhi.core.aggregation;
 
 import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
@@ -25,10 +26,17 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.query.selector.GroupByKeyGenerator;
+import io.siddhi.core.util.parser.AggregationParser;
+import io.siddhi.core.util.snapshot.state.PartitionStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * This class implements logic to process aggregates(after retrieval from tables) that were aggregated
@@ -37,67 +45,208 @@
 public class IncrementalExternalTimestampDataAggregator {
 
     private final GroupByKeyGenerator groupByKeyGenerator;
-    private final BaseIncrementalValueStore baseIncrementalValueStore;
-    private final Map<String, BaseIncrementalValueStore> baseIncrementalValueGroupByStore;
+    private final List<ExpressionExecutor> baseExecutors;
+    private final StateHolder valueStateHolder;
+    private final StreamEvent resetEvent;
+    //    private final BaseIncrementalValueStore baseIncrementalValueStore;
+//    private final ExpressionExecutor shouldUpdateExpressionExecutorForFind;
+    private StreamEventPool streamEventPool;
+    private final ExpressionExecutor shouldUpdateTimestamp;
 
     public IncrementalExternalTimestampDataAggregator(List<ExpressionExecutor> baseExecutors,
                                                       GroupByKeyGenerator groupByKeyGenerator,
                                                       MetaStreamEvent metaStreamEvent,
-                                                      SiddhiAppContext siddhiAppContext,
-                                                      ExpressionExecutor shouldUpdateExpressionExecutor) {
-        StreamEventPool streamEventPool = new StreamEventPool(metaStreamEvent, 10);
-
-        List<ExpressionExecutor> expressionExecutorsWithoutTime = baseExecutors.subList(1, baseExecutors.size());
-        this.baseIncrementalValueStore = new BaseIncrementalValueStore(-1,
-                expressionExecutorsWithoutTime, streamEventPool, siddhiAppContext, null,
-                shouldUpdateExpressionExecutor);
-        this.baseIncrementalValueGroupByStore = new HashMap<>();
+                                                      SiddhiQueryContext siddhiQueryContext,
+                                                      ExpressionExecutor shouldUpdateTimestamp) {
+        this.baseExecutors = baseExecutors.subList(1, baseExecutors.size());
+        streamEventPool = new StreamEventPool(metaStreamEvent, 10);
+        this.shouldUpdateTimestamp = shouldUpdateTimestamp;
+
+//        List<ExpressionExecutor> expressionExecutorsWithoutTime = baseExecutors.subList(1, baseExecutors.size());
+//        this.baseIncrementalValueStore = new BaseIncrementalValueStore(
+//                expressionExecutorsWithoutTime, streamEventPool, siddhiQueryContext, null,
+//                shouldUpdateExpressionExecutorForFind, -1, groupBy, true);
         this.groupByKeyGenerator = groupByKeyGenerator;
+        if (groupByKeyGenerator != null) {
+            this.valueStateHolder = new PartitionStateHolder(() -> new ValueState());
+        } else {
+            this.valueStateHolder = new SingleStateHolder(() -> new ValueState());
+        }
+        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
+
+//        this.shouldUpdateExpressionExecutorForFind = shouldUpdateExpressionExecutorForFind;
     }
 
     public ComplexEventChunk<StreamEvent> aggregateData(ComplexEventChunk<StreamEvent> retrievedData) {
 
+        Set<String> groupByKeys = new HashSet<>();
         while (retrievedData.hasNext()) {
             StreamEvent streamEvent = retrievedData.next();
             String groupByKey = groupByKeyGenerator.constructEventKey(streamEvent);
-            BaseIncrementalValueStore baseIncrementalValueStore = baseIncrementalValueGroupByStore
-                    .computeIfAbsent(
-                            groupByKey, k -> this.baseIncrementalValueStore.cloneStore(k, -1)
-                    );
-            process(streamEvent, baseIncrementalValueStore);
+            groupByKeys.add(groupByKey);
+            SiddhiAppContext.startGroupByFlow(groupByKey);
+            ValueState state = (ValueState) valueStateHolder.getState();
+
+//            try {
+//            BaseIncrementalValueStore baseIncrementalValueStore = baseIncrementalValueGroupByStore
+//                    .computeIfAbsent(
+//                            groupByKey, k -> this.baseIncrementalValueStore.cloneStore(k, -1)
+//                    );
+//                process(streamEvent, baseIncrementalValueStore);
+//                process(streamEvent);
+
+            try {
+                boolean shouldUpdate = true;
+                if (shouldUpdateTimestamp != null) {
+                    shouldUpdate = (boolean) shouldUpdate(shouldUpdateTimestamp.execute(streamEvent), state);
+                }
+                for (int i = 0; i < baseExecutors.size(); i++) { // keeping timestamp value location as null
+                    if (shouldUpdate) {
+                        ExpressionExecutor expressionExecutor = baseExecutors.get(i);
+                        state.setValue(expressionExecutor.execute(streamEvent), i + 1);
+                    } else {
+                        ExpressionExecutor expressionExecutor = baseExecutors.get(i);
+                        if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
+                            state.setValue(expressionExecutor.execute(streamEvent), i + 1);
+                        }
+                    }
+                }
+            } finally {
+                valueStateHolder.returnState(state);
+                SiddhiAppContext.stopGroupByFlow();
+            }
+//            } finally {
+//                SiddhiAppContext.stopGroupByFlow();
+//            }
+        }
+
+        //clean all executors
+        for (String groupByKey : groupByKeys) {
+            SiddhiAppContext.startGroupByFlow(groupByKey);
+            try {
+                for (ExpressionExecutor expressionExecutor : baseExecutors) {
+                    expressionExecutor.execute(resetEvent);
+                }
+            } finally {
+                SiddhiAppContext.stopGroupByFlow();
+            }
         }
         return createEventChunkFromAggregatedData();
     }
 
-    private void process(StreamEvent streamEvent, BaseIncrementalValueStore baseIncrementalValueStore) {
-        List<ExpressionExecutor> expressionExecutors = baseIncrementalValueStore.getExpressionExecutors();
-        boolean shouldUpdate = true;
-        ExpressionExecutor shouldUpdateExpressionExecutor =
-                baseIncrementalValueStore.getShouldUpdateExpressionExecutor();
-        if (shouldUpdateExpressionExecutor != null) {
-            shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
+//    private void process(StreamEvent streamEvent, BaseIncrementalValueStore baseIncrementalValueStore) {
+//        List<ExpressionExecutor> expressionExecutors = baseIncrementalValueStore.getExpressionExecutors();
+//        boolean shouldUpdate = true;
+//        ExpressionExecutor shouldUpdateExpressionExecutor =
+//                baseIncrementalValueStore.getShouldUpdateExpressionExecutor();
+//        if (shouldUpdateExpressionExecutor != null) {
+//            shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
+//        }
+//        baseIncrementalValueStore.setProcessed(true);
+//        for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
+//            if (shouldUpdate) {
+//                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+//                baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
+//            } else {
+//                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
+//                if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
+//                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
+//                }
+//            }
+//        }
+//    }
+
+//    private void process(StreamEvent streamEvent) {
+//        IncrementalDataAggregator.ValueState state = (IncrementalDataAggregator.ValueState)
+// valueStateHolder.getState();
+//        try {
+//            boolean shouldUpdate = true;
+//            if (shouldUpdateTimestamp != null) {
+//                shouldUpdate = ((boolean) shouldUpdate(shouldUpdateTimestamp.execute(streamEvent), );
+//            }
+//            for (int i = 0; i < baseExecutors.size(); i++) { // keeping timestamp value location as null
+//                if (shouldUpdate) {
+//                    ExpressionExecutor expressionExecutor = baseExecutors.get(i);
+//                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
+//                } else {
+//                    ExpressionExecutor expressionExecutor = baseExecutors.get(i);
+//                    if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
+//                        baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
+//                    }
+//                }
+//            }
+//        } finally {
+//            valueStateHolder.returnState(state);
+//        }
+//    }
+
+    private Object shouldUpdate(Object data, ValueState state) {
+        long timestamp = (long) data;
+        if (timestamp >= state.lastTimestamp) {
+            state.lastTimestamp = timestamp;
+            return true;
         }
+        return false;
+    }
 
-        for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
-            if (shouldUpdate) {
-                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-                baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-            } else {
-                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-                if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
-                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-                }
+
+    private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
+//        ComplexEventChunk<StreamEvent> processedInMemoryEventChunk = new ComplexEventChunk<>(true);
+//        return baseIncrementalValueStore.getProcessedEventChunk();
+//        for (Map.Entry<String, BaseIncrementalValueStore> entryAgainstTime :
+//                baseIncrementalValueGroupByStore.entrySet()) {
+//            processedInMemoryEventChunk.add(entryAgainstTime.getValue().createStreamEvent());
+//        }
+//        return processedInMemoryEventChunk;
+
+        ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(true);
+        Map<String, State> valueStoreMap = this.valueStateHolder.getAllStates();
+        try {
+            for (State aState : valueStoreMap.values()) {
+                ValueState state = (ValueState) aState;
+                StreamEvent streamEvent = streamEventPool.borrowEvent();
+                long timestamp = state.lastTimestamp;
+                streamEvent.setTimestamp(timestamp);
+                state.setValue(timestamp, 0);
+                streamEvent.setOutputData(state.values);
+                streamEventChunk.add(streamEvent);
             }
+        } finally {
+            this.valueStateHolder.returnStates(valueStoreMap);
         }
-        baseIncrementalValueStore.setProcessed(true);
+        return streamEventChunk;
     }
 
-    private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
-        ComplexEventChunk<StreamEvent> processedInMemoryEventChunk = new ComplexEventChunk<>(true);
-        for (Map.Entry<String, BaseIncrementalValueStore> entryAgainstTime :
-                baseIncrementalValueGroupByStore.entrySet()) {
-            processedInMemoryEventChunk.add(entryAgainstTime.getValue().createStreamEvent());
+    class ValueState extends State {
+        private Object[] values;
+        private long lastTimestamp = 0;
+
+        public ValueState() {
+            this.values = new Object[baseExecutors.size() + 1];
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return values == null && lastTimestamp == 0;
         }
-        return processedInMemoryEventChunk;
+
+        public void setValue(Object value, int position) {
+            values[position] = value;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Values", values);
+            state.put("LastTimestamp", lastTimestamp);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            values = (Object[]) state.get("Values");
+            lastTimestamp = (Long) state.get("LastTimestamp");
+        }
+
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
index 6fa92c2b6d..ce0d1b1d86 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
@@ -20,11 +20,16 @@
 
 import com.lmax.disruptor.ExceptionHandler;
 import io.siddhi.core.function.Script;
-import io.siddhi.core.util.ElementIdGenerator;
+import io.siddhi.core.util.IdGenerator;
 import io.siddhi.core.util.Scheduler;
+import io.siddhi.core.util.SiddhiConstants;
 import io.siddhi.core.util.ThreadBarrier;
-import io.siddhi.core.util.extension.holder.EternalReferencedHolder;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 import io.siddhi.core.util.snapshot.SnapshotService;
+import io.siddhi.core.util.snapshot.state.EmptyStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.core.util.statistics.StatisticsManager;
 import io.siddhi.core.util.timestamp.TimestampGenerator;
 import io.siddhi.query.api.SiddhiApp;
@@ -53,12 +58,12 @@ public class SiddhiAppContext {
 
     private ExecutorService executorService;
     private ScheduledExecutorService scheduledExecutorService;
-    private List<EternalReferencedHolder> eternalReferencedHolders;
+    private List<ExternalReferencedHolder> externalReferencedHolders;
     private SnapshotService snapshotService;
 
     private ThreadBarrier threadBarrier = null;
     private TimestampGenerator timestampGenerator = null;
-    private ElementIdGenerator elementIdGenerator;
+    private IdGenerator idGenerator;
     private Map<String, Script> scriptFunctionMap;
     private ExceptionHandler<Object> disruptorExceptionHandler;
     private ExceptionListener runtimeExceptionListener;
@@ -67,13 +72,43 @@ public class SiddhiAppContext {
     private List<String> includedMetrics;
     private boolean transportChannelCreationEnabled;
     private List<Scheduler> schedulerList;
+    private static final ThreadLocal<String> GROUP_BY_KEY = new ThreadLocal<>();
+    private static final ThreadLocal<String> PARTITION_KEY = new ThreadLocal<>();
 
     public SiddhiAppContext() {
-        this.eternalReferencedHolders = Collections.synchronizedList(new LinkedList<>());
+        this.externalReferencedHolders = Collections.synchronizedList(new LinkedList<>());
         this.scriptFunctionMap = new HashMap<String, Script>();
         this.schedulerList = new ArrayList<Scheduler>();
     }
 
+    public static void startGroupByFlow(String key) {
+        GROUP_BY_KEY.set(key);
+    }
+
+    public static void stopGroupByFlow() {
+        GROUP_BY_KEY.set(null);
+    }
+
+    public static void startPartitionFlow(String key) {
+        PARTITION_KEY.set(key);
+    }
+
+    public static void stopPartitionFlow() {
+        PARTITION_KEY.set(null);
+    }
+
+    public static String getCurrentFlowId() {
+        return PARTITION_KEY.get() + "--" + GROUP_BY_KEY.get();
+    }
+
+    public static String getPartitionFlowId() {
+        return PARTITION_KEY.get();
+    }
+
+    public static String getGroupByFlowId() {
+        return PARTITION_KEY.get();
+    }
+
     public SiddhiContext getSiddhiContext() {
         return siddhiContext;
     }
@@ -130,12 +165,12 @@ public void setScheduledExecutorService(ScheduledExecutorService scheduledExecut
         this.scheduledExecutorService = scheduledExecutorService;
     }
 
-    public synchronized void addEternalReferencedHolder(EternalReferencedHolder eternalReferencedHolder) {
-        eternalReferencedHolders.add(eternalReferencedHolder);
+    public synchronized void addEternalReferencedHolder(ExternalReferencedHolder externalReferencedHolder) {
+        externalReferencedHolders.add(externalReferencedHolder);
     }
 
-    public List<EternalReferencedHolder> getEternalReferencedHolders() {
-        return Collections.unmodifiableList(new ArrayList<>(eternalReferencedHolders));
+    public List<ExternalReferencedHolder> getExternalReferencedHolders() {
+        return Collections.unmodifiableList(new ArrayList<>(externalReferencedHolders));
     }
 
     public ThreadBarrier getThreadBarrier() {
@@ -170,12 +205,12 @@ public void setSnapshotService(SnapshotService snapshotService) {
         this.snapshotService = snapshotService;
     }
 
-    public ElementIdGenerator getElementIdGenerator() {
-        return elementIdGenerator;
-    }
+//    public IdGenerator getElementIdGenerator() {
+//        return idGenerator;
+//    }
 
-    public void setElementIdGenerator(ElementIdGenerator elementIdGenerator) {
-        this.elementIdGenerator = elementIdGenerator;
+    public void setIdGenerator(IdGenerator idGenerator) {
+        this.idGenerator = idGenerator;
     }
 
     public Script getScript(String name) {
@@ -249,4 +284,19 @@ public void addScheduler(Scheduler scheduler) {
     public List<Scheduler> getSchedulerList() {
         return schedulerList;
     }
+
+    public StateHolder generateStateHolder(String name, StateFactory stateFactory) {
+        if (stateFactory != null) {
+            StateHolder stateHolder = new SingleStateHolder(stateFactory);
+            if (SnapshotService.getSkipStateStorageThreadLocal().get() != null &&
+                    !SnapshotService.getSkipStateStorageThreadLocal().get()) {
+                Map<String, StateHolder> stateHolderMap = getSnapshotService().getStateHolderMap(
+                        SiddhiConstants.PARTITION_ID_DEFAULT, this.getName());
+                stateHolderMap.put(name + "-" + idGenerator.createNewId(), stateHolder);
+            }
+            return stateHolder;
+        } else {
+            return new EmptyStateHolder();
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiQueryContext.java b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiQueryContext.java
index 82f3b4db82..387a822b48 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiQueryContext.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiQueryContext.java
@@ -18,10 +18,20 @@
 
 package io.siddhi.core.config;
 
+import io.siddhi.core.util.IdGenerator;
+import io.siddhi.core.util.SiddhiConstants;
+import io.siddhi.core.util.snapshot.SnapshotService;
+import io.siddhi.core.util.snapshot.state.EmptyStateHolder;
+import io.siddhi.core.util.snapshot.state.PartitionStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.core.util.statistics.LatencyTracker;
 import io.siddhi.query.api.SiddhiApp;
 import io.siddhi.query.api.execution.query.output.stream.OutputStream;
 
+import java.util.Map;
+
 /**
  * Holder object for context information of {@link SiddhiApp}.
  */
@@ -29,13 +39,22 @@ public class SiddhiQueryContext {
 
     private SiddhiAppContext siddhiAppContext = null;
     private String name;
+    private String partitionId;
+    private boolean partitioned;
     private OutputStream.OutputEventType outputEventType;
     private LatencyTracker latencyTracker;
+    private Map<String, StateHolder> stateHolderMap;
+    private IdGenerator idGenerator;
 
     public SiddhiQueryContext(SiddhiAppContext siddhiAppContext, String queryName) {
+        this(siddhiAppContext, queryName, SiddhiConstants.PARTITION_ID_DEFAULT);
+    }
 
+    public SiddhiQueryContext(SiddhiAppContext siddhiAppContext, String queryName, String partitionId) {
         this.siddhiAppContext = siddhiAppContext;
         this.name = queryName;
+        this.partitionId = partitionId;
+        this.idGenerator = new IdGenerator();
     }
 
     public String getName() {
@@ -73,4 +92,35 @@ public void setLatencyTracker(LatencyTracker latencyTracker) {
     public LatencyTracker getLatencyTracker() {
         return latencyTracker;
     }
+
+    public boolean isPartitioned() {
+        return partitioned;
+    }
+
+    public void setPartitioned(boolean partitionable) {
+        partitioned = partitionable;
+    }
+
+    public String generateNewId() {
+        return idGenerator.createNewId();
+    }
+
+    public StateHolder generateStateHolder(String name, boolean groupBy, StateFactory stateFactory) {
+        if (stateFactory != null) {
+            StateHolder stateHolder;
+            if (partitioned || groupBy) {
+                stateHolder = new PartitionStateHolder(stateFactory);
+            } else {
+                stateHolder = new SingleStateHolder(stateFactory);
+            }
+            if (SnapshotService.getSkipStateStorageThreadLocal().get() == null ||
+                    !SnapshotService.getSkipStateStorageThreadLocal().get()) {
+                stateHolderMap = siddhiAppContext.getSnapshotService().getStateHolderMap(partitionId, this.getName());
+                stateHolderMap.put(idGenerator.createNewId() + "-" + name, stateHolder);
+            }
+            return stateHolder;
+        } else {
+            return new EmptyStateHolder();
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/debugger/SiddhiDebugger.java b/modules/siddhi-core/src/main/java/io/siddhi/core/debugger/SiddhiDebugger.java
index fd6f7aa234..8d7b8ab5cb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/debugger/SiddhiDebugger.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/debugger/SiddhiDebugger.java
@@ -20,7 +20,6 @@
 import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.util.snapshot.SnapshotService;
-import io.siddhi.core.util.snapshot.Snapshotable;
 import org.apache.log4j.Logger;
 
 import java.util.HashMap;
@@ -204,8 +203,7 @@ public void setDebuggerCallback(SiddhiDebuggerCallback siddhiDebuggerCallback) {
     }
 
     /**
-     * Get all the events stored in the {@link Snapshotable} entities of the given
-     * query.
+     * Get all the event states stored in the given query.
      *
      * @param queryName name of the Siddhi query
      * @return QueryState internal state of the query
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/holder/SnapshotableStreamEventQueue.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/holder/SnapshotableStreamEventQueue.java
index 7da77adb9e..2c1e3a2fd5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/holder/SnapshotableStreamEventQueue.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/holder/SnapshotableStreamEventQueue.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.event.stream.Operation.Operator;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.util.snapshot.SnapshotRequest;
-import io.siddhi.core.util.snapshot.state.SnapshotState;
+import io.siddhi.core.util.snapshot.state.Snapshot;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
 
 import java.io.Serializable;
@@ -269,12 +269,12 @@ public int hashCode() {
         return result;
     }
 
-    public SnapshotState getSnapshot() {
+    public Snapshot getSnapshot() {
         if (isFullSnapshot()) {
             forceFullSnapshot = false;
-            return new SnapshotState(this.getFirst(), false);
+            return new Snapshot(this.getFirst(), false);
         } else {
-            SnapshotState snapshot = new SnapshotState(operationChangeLog, true);
+            Snapshot snapshot = new Snapshot(operationChangeLog, true);
             operationChangeLog = new ArrayList<>();
             return snapshot;
         }
@@ -287,11 +287,11 @@ private boolean isFullSnapshot() {
     }
 
     public void restore(SnapshotStateList snapshotStatelist) {
-        TreeMap<Long, SnapshotState> revisions = snapshotStatelist.getSnapshotStates();
-        Iterator<Map.Entry<Long, SnapshotState>> itr = revisions.entrySet().iterator();
+        TreeMap<Long, Snapshot> revisions = snapshotStatelist.getSnapshotStates();
+        Iterator<Map.Entry<Long, Snapshot>> itr = revisions.entrySet().iterator();
         this.isOperationLogEnabled = false;
         while (itr.hasNext()) {
-            Map.Entry<Long, SnapshotState> snapshotEntry = itr.next();
+            Map.Entry<Long, Snapshot> snapshotEntry = itr.next();
             if (!snapshotEntry.getValue().isIncrementalSnapshot()) {
                 this.clear();
                 this.add((StreamEvent) snapshotEntry.getValue().getState());
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/ConstantExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/ConstantExpressionExecutor.java
index 71a5ec0d70..f9fa8ec278 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/ConstantExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/ConstantExpressionExecutor.java
@@ -42,18 +42,8 @@ public Attribute.Type getReturnType() {
         return type;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return this;
-    }
-
     public Object getValue() {
         return value;
     }
 
-    @Override
-    public void clean() {
-        //ignore
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/ExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/ExpressionExecutor.java
index 8296288350..36b6cb9e62 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/ExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/ExpressionExecutor.java
@@ -30,8 +30,4 @@ public interface ExpressionExecutor {
 
     Attribute.Type getReturnType();
 
-    ExpressionExecutor cloneExecutor(String key);
-
-    void clean();
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/VariableExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/VariableExpressionExecutor.java
index 629435c1a1..edb79a2322 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/VariableExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/VariableExpressionExecutor.java
@@ -51,11 +51,6 @@ public Attribute.Type getReturnType() {
         return attribute.getType();
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return this;
-    }
-
     public Attribute getAttribute() {
         return attribute;
     }
@@ -83,9 +78,4 @@ public void setPosition(int[] position) {
         }
     }
 
-    @Override
-    public void clean() {
-        //ignore
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/AndConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/AndConditionExpressionExecutor.java
index 51fb1b23da..9afcacc4af 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/AndConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/AndConditionExpressionExecutor.java
@@ -74,16 +74,4 @@ public Boolean execute(ComplexEvent event) {
         return Boolean.FALSE;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new AndConditionExpressionExecutor(leftConditionExecutor.cloneExecutor(key), rightConditionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftConditionExecutor.clean();
-        rightConditionExecutor.clean();
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/BoolConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/BoolConditionExpressionExecutor.java
index 512ad7ec0d..437e2a0869 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/BoolConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/BoolConditionExpressionExecutor.java
@@ -49,14 +49,4 @@ public Boolean execute(ComplexEvent event) {
         }
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new BoolConditionExpressionExecutor(conditionExecutor.cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        conditionExecutor.clean();
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/InConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/InConditionExpressionExecutor.java
index e26106f9d3..b2e1069199 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/InConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/InConditionExpressionExecutor.java
@@ -21,7 +21,6 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.table.Table;
 import io.siddhi.core.util.collection.FinderStateEvent;
 import io.siddhi.core.util.collection.operator.CompiledCondition;
@@ -65,16 +64,4 @@ public synchronized Boolean execute(ComplexEvent event) {
         }
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new InConditionExpressionExecutor(table, compiledCondition.cloneCompilation(key),
-                streamEventSize, isMatchingEventAStateEvent, matchingStreamIndex);
-    }
-
-    @Override
-    public void clean() {
-        //ignore
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/IsNullConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/IsNullConditionExpressionExecutor.java
index b81356f068..edbf2dcb76 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/IsNullConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/IsNullConditionExpressionExecutor.java
@@ -41,14 +41,4 @@ public Boolean execute(ComplexEvent event) {
         }
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new IsNullConditionExpressionExecutor(expressionExecutor.cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        expressionExecutor.clean();
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/IsNullStreamConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/IsNullStreamConditionExpressionExecutor.java
index 80b6374d8e..b3a2506982 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/IsNullStreamConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/IsNullStreamConditionExpressionExecutor.java
@@ -21,7 +21,6 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.executor.ExpressionExecutor;
 
 /**
  * Executor class for IsNullStream condition. Condition evaluation logic is implemented within executor.
@@ -51,14 +50,4 @@ public Boolean execute(ComplexEvent event) {
         }
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new IsNullStreamConditionExpressionExecutor(eventPosition);
-    }
-
-    @Override
-    public void clean() {
-        //ignore
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/NotConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/NotConditionExpressionExecutor.java
index 4057e30f8c..e0e36637b9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/NotConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/NotConditionExpressionExecutor.java
@@ -49,14 +49,4 @@ public Boolean execute(ComplexEvent event) {
         }
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotConditionExpressionExecutor(conditionExecutor.cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        conditionExecutor.clean();
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/OrConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/OrConditionExpressionExecutor.java
index 828ddd2a17..705be9cd04 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/OrConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/OrConditionExpressionExecutor.java
@@ -75,16 +75,4 @@ public Boolean execute(ComplexEvent event) {
         return Boolean.FALSE;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new OrConditionExpressionExecutor(leftConditionExecutor.cloneExecutor(key), rightConditionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftConditionExecutor.clean();
-        rightConditionExecutor.clean();
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/CompareConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/CompareConditionExpressionExecutor.java
index 76fe863607..198784fad1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/CompareConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/CompareConditionExpressionExecutor.java
@@ -44,9 +44,4 @@ public Boolean execute(ComplexEvent event) {
 
     protected abstract Boolean execute(Object left, Object right);
 
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorBoolBool.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorBoolBool.java
index 5a4aafafc4..9d606d410a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorBoolBool.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorBoolBool.java
@@ -35,9 +35,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Boolean) left).booleanValue() == ((Boolean) right).booleanValue();
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorBoolBool(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleDouble.java
index ce891e84e0..3953ae9299 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorDoubleDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleFloat.java
index 1748e5281f..0856c00479 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleFloat.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorDoubleFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleInt.java
index 0d4deb7d26..cfc227dd69 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleInt.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Double) left == ((Integer) right).doubleValue();
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorDoubleInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleLong.java
index caf5bd0514..2d83db15e8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorDoubleLong.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Double) left == ((Long) right).doubleValue();
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorDoubleLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatDouble.java
index 1ed7191c2e..b6fb36b292 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatDouble.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Float) left).doubleValue() == (Double) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorFloatDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatFloat.java
index f71f33cb44..7f4331d5b3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatFloat.java
@@ -36,9 +36,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Float) left).floatValue() == ((Float) right).floatValue();
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorFloatFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatInt.java
index 288f833bc5..3c94a85d36 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatInt.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left == ((Integer) right).floatValue();
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorFloatInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatLong.java
index 053f4cfe7d..21b98d6c63 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorFloatLong.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Float) left).doubleValue() == ((Long) right).doubleValue();
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorFloatLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntDouble.java
index b887f6d159..92248a5f0e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntDouble.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Integer) left).doubleValue() == (Double) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorIntDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntFloat.java
index b0739e5d7e..e59b26162b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntFloat.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Integer) left).floatValue() == (Float) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorIntFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntInt.java
index fea843feaa..1db67071b2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntInt.java
@@ -36,10 +36,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Integer) left).intValue() == (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorIntInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntLong.java
index b15a388a7c..f28eb4cfac 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorIntLong.java
@@ -36,12 +36,5 @@ public EqualCompareConditionExpressionExecutorIntLong(
     @Override
     protected Boolean execute(Object left, Object right) {
         return ((Integer) left).longValue() == (Long) right;
-
-    }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorIntLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongDouble.java
index de96eb8f82..c346777b51 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongDouble.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Long) left).doubleValue() == (Double) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorLongDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongFloat.java
index 37ba30aa3c..facae9c84b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongFloat.java
@@ -35,12 +35,5 @@ public EqualCompareConditionExpressionExecutorLongFloat(
     @Override
     protected Boolean execute(Object left, Object right) {
         return ((Long) left).doubleValue() == ((Float) right).doubleValue();
-
-    }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorLongFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongInt.java
index c9a182668b..bc06b16fcb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongInt.java
@@ -35,12 +35,5 @@ public EqualCompareConditionExpressionExecutorLongInt(
     @Override
     protected Boolean execute(Object left, Object right) {
         return (Long) left == ((Integer) right).longValue();
-
-    }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorLongInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongLong.java
index 95678a8d4e..b5f9d82bbc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorLongLong.java
@@ -35,12 +35,5 @@ public EqualCompareConditionExpressionExecutorLongLong(
     @Override
     protected Boolean execute(Object left, Object right) {
         return ((Long) left).longValue() == (Long) right;
-
-    }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorLongLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorStringString.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorStringString.java
index 1a9df95c35..e62eb8694e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorStringString.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/equal/EqualCompareConditionExpressionExecutorStringString.java
@@ -33,10 +33,4 @@ public EqualCompareConditionExpressionExecutorStringString(ExpressionExecutor le
     protected Boolean execute(Object left, Object right) {
         return left.equals(right);
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new EqualCompareConditionExpressionExecutorStringString(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleDouble.java
index f882adb887..aa6c5c994a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleDouble.java
@@ -35,12 +35,5 @@ public GreaterThanCompareConditionExpressionExecutorDoubleDouble(
     @Override
     protected Boolean execute(Object left, Object right) {
         return (Double) left > (Double) right;
-
-    }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorDoubleDouble(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleFloat.java
index 5b2d2a511e..6812e07d22 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleFloat.java
@@ -34,12 +34,5 @@ public GreaterThanCompareConditionExpressionExecutorDoubleFloat(ExpressionExecut
     @Override
     protected Boolean execute(Object left, Object right) {
         return (Double) left > (Float) right;
-
-    }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorDoubleFloat(leftExpressionExecutor.cloneExecutor(key)
-                , rightExpressionExecutor.cloneExecutor(key));
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleInt.java
index a89c7161f8..161d73386a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleInt.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorDoubleInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleLong.java
index 8833349a1e..3e40bd8f75 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorDoubleLong.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorDoubleLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatDouble.java
index cf3dc5acc7..44555d2bc3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatDouble.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left > (Double) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorFloatDouble(leftExpressionExecutor.cloneExecutor(key)
-                , rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatFloat.java
index 1626d6ecf5..bdef8190e9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatFloat.java
@@ -36,9 +36,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left > (Float) right;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorFloatFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatInt.java
index 9b9ecfad3c..3a18f9cd84 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatInt.java
@@ -35,12 +35,6 @@ public GreaterThanCompareConditionExpressionExecutorFloatInt(
     @Override
     protected Boolean execute(Object left, Object right) {
         return (Float) left > (Integer) right;
-
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorFloatInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatLong.java
index c45e5715d6..f68220a530 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorFloatLong.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left > (Long) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorFloatLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntDouble.java
index 3b3b2f25d7..829cc575c6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntDouble.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorIntDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntFloat.java
index b63addf0e7..78c8f23e2c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntFloat.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorIntFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntInt.java
index a1fbf7b752..6ed334021d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntInt.java
@@ -36,9 +36,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorIntInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntLong.java
index f7e762cf79..73995c1bdb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorIntLong.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Integer) left > (Long) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorIntLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongDouble.java
index af0c05308f..ae9c68c9a5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongDouble.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorLongDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongFloat.java
index 53680f7f58..fde875b74e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongFloat.java
@@ -36,10 +36,4 @@ protected Boolean execute(Object left, Object right) {
         return (Long) left > (Float) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorLongFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongInt.java
index 9ff28f680f..fd6f2a617f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongInt.java
@@ -36,10 +36,4 @@ protected Boolean execute(Object left, Object right) {
         return (Long) left > (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorLongInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongLong.java
index 253133762b..0bb71c53cf 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthan/GreaterThanCompareConditionExpressionExecutorLongLong.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanCompareConditionExpressionExecutorLongLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleDouble.java
index 5ad830f685..4f65f11bdb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleDouble.java
@@ -39,10 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorDoubleDouble(leftExpressionExecutor
-                .cloneExecutor(key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleFloat.java
index 8c0f5d3b29..eb2cf39da2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleFloat.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorDoubleFloat(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleInt.java
index 1e9fd82b0b..47e32360ba 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleInt.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorDoubleInt(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleLong.java
index 32084bf72b..02eb30283b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorDoubleLong.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorDoubleLong(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatDouble.java
index d2294288bd..c771cd657e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatDouble.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left >= (Double) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorFloatDouble(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatFloat.java
index da0c82f022..a19fe71f97 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatFloat.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left >= (Float) right;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorFloatFloat(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatInt.java
index bbb6ea9871..26fd7d4d10 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatInt.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorFloatInt(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatLong.java
index e6021e4f0a..4efbdd21b1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorFloatLong.java
@@ -39,10 +39,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left >= (Long) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorFloatLong(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntDouble.java
index a70f7255ae..9dc9961c05 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorIntDouble(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntFloat.java
index ce7dc3f07d..476d04918c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntFloat.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Integer) left >= (Float) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorIntFloat(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntInt.java
index c55043f2ed..3aaa659814 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntInt.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Integer) left >= (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorIntInt(leftExpressionExecutor.cloneExecutor(key)
-                , rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntLong.java
index 90bfed8f15..baa603dbc4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorIntLong.java
@@ -40,9 +40,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorIntLong(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongDouble.java
index 1159c5fee7..24c1d182d0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorLongDouble(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongFloat.java
index 8325183483..f452f12a1a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongFloat.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorLongFloat(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongInt.java
index 76836a7167..5c26b5cdd8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongInt.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorLongInt(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongLong.java
index d468a388f8..21c42bc672 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/greaterthanequal/GreaterThanEqualCompareConditionExpressionExecutorLongLong.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GreaterThanEqualCompareConditionExpressionExecutorLongLong(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleDouble.java
index ad0623142f..66899ad40f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorDoubleDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleFloat.java
index e96cd3587d..76e7c0deaa 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleFloat.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorDoubleFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleInt.java
index 1ab1777e78..a38eb58770 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleInt.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorDoubleInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleLong.java
index 3a5fa4d974..d32e21cc6f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorDoubleLong.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorDoubleLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatDouble.java
index 6be4fb224e..907867f445 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorFloatDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatFloat.java
index 11b5567592..6da22ffd20 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatFloat.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left < (Float) right;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorFloatFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatInt.java
index 3d49eb0d13..7e7bfe1319 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatInt.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left < (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorFloatInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatLong.java
index 53dbbbd489..e687bd2183 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorFloatLong.java
@@ -40,9 +40,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorFloatLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntDouble.java
index dff0b10e23..0bc30b5abb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntDouble.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Integer) left < (Double) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorIntDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntFloat.java
index aecb5e63ca..d539e65db5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntFloat.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorIntFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntInt.java
index 647db45296..76b3df407a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntInt.java
@@ -36,10 +36,4 @@ protected Boolean execute(Object left, Object right) {
         return (Integer) left < (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorIntInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntLong.java
index 8561606c5f..9613ea9d66 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorIntLong.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorIntLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongDouble.java
index e72e341098..3a26483c3d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongDouble.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorLongDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongFloat.java
index cbab2302bf..9eefcaedb1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongFloat.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorLongFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongInt.java
index d3246f88a1..0744433393 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongInt.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorLongInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongLong.java
index ec9b546152..f190720cd7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthan/LessThanCompareConditionExpressionExecutorLongLong.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanCompareConditionExpressionExecutorLongLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleDouble.java
index 2f2f44decf..d0a217b2f5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorDoubleDouble(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleFloat.java
index 512594e3ef..4a5d9b8911 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleFloat.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorDoubleFloat(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleInt.java
index 21e51e01d7..ca36eb635a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleInt.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Double) left <= (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorDoubleInt(leftExpressionExecutor.cloneExecutor(key)
-                , rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleLong.java
index 55e5ddc598..02de1c77e3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorDoubleLong.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorDoubleLong(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatDouble.java
index 0eeab083e4..945208a06c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatDouble.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left <= (Double) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorFloatDouble(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatFloat.java
index 784dbc4a70..daa7132422 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatFloat.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left <= (Float) right;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorFloatFloat(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatInt.java
index 683b58ab8d..a780eaa5fa 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatInt.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left <= (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorFloatInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatLong.java
index 507ae84353..9bec1286d5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorFloatLong.java
@@ -39,10 +39,4 @@ protected Boolean execute(Object left, Object right) {
         return (Float) left <= (Long) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorFloatLong(leftExpressionExecutor.cloneExecutor(key)
-                , rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntDouble.java
index 458f36d644..9c3674e027 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorIntDouble(leftExpressionExecutor.cloneExecutor(key)
-                , rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntFloat.java
index 1b8696b96e..ba67945b22 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntFloat.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorIntFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntInt.java
index a18b136633..52e0ac38fe 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntInt.java
@@ -37,10 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return (Integer) left <= (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorIntInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntLong.java
index b2b47f4885..bcf279c829 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorIntLong.java
@@ -40,9 +40,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorIntLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongDouble.java
index 80c2a221e3..ce41db7db7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorLongDouble(leftExpressionExecutor.cloneExecutor
-                (key), rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongFloat.java
index c970ac2518..8a7ce4b9b5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongFloat.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorLongFloat(leftExpressionExecutor.cloneExecutor(key)
-                , rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongInt.java
index ba7e0a48f9..90f02e6f2f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongInt.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Long) left <= (Integer) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorLongInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongLong.java
index 45f94a0a21..8f429972d6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/lessthanequal/LessThanEqualCompareConditionExpressionExecutorLongLong.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return (Long) left <= (Long) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new LessThanEqualCompareConditionExpressionExecutorLongLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorBoolBool.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorBoolBool.java
index 4c4b58bf41..9570e875a3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorBoolBool.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorBoolBool.java
@@ -35,9 +35,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Boolean) left).booleanValue() != ((Boolean) right).booleanValue();
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorBoolBool(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleDouble.java
index 0cbef5b160..c769cf26d4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleDouble.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Double) left).doubleValue() != ((Double) right).doubleValue();
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorDoubleDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleFloat.java
index 4df7dbc531..ceea82cf4a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleFloat.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorDoubleFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleInt.java
index a75a254f4c..1f978ecb8c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleInt.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorDoubleInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleLong.java
index 4a9910cbe9..d4119b269e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorDoubleLong.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorDoubleLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatDouble.java
index b5b8ff6970..6a0f370b90 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorFloatDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatFloat.java
index a8b912a61a..6d23e6ea19 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatFloat.java
@@ -37,9 +37,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Float) left).floatValue() != ((Float) right).floatValue();
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorFloatFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatInt.java
index 2ec08f0853..36fba05204 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatInt.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorFloatInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatLong.java
index 14c727ca4c..707f3ac08b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorFloatLong.java
@@ -40,9 +40,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorFloatLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntDouble.java
index 168a0d703f..1c2f71aee9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorIntDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntFloat.java
index ba33093399..8ec94498e9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntFloat.java
@@ -38,10 +38,4 @@ protected Boolean execute(Object left, Object right) {
         return ((Integer) left).floatValue() != (Float) right;
 
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorIntFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntInt.java
index b691819642..6a5b179bc3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntInt.java
@@ -38,9 +38,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorIntInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntLong.java
index c2040eb207..8dfd2751c2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorIntLong.java
@@ -40,9 +40,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorIntLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongDouble.java
index f3355a7129..d936fa75ab 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongDouble.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorLongDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongFloat.java
index aca53ab49e..87be1eac9e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongFloat.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorLongFloat(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongInt.java
index 45cd7ae86b..a9f9c0c4ad 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongInt.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorLongInt(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongLong.java
index a630fb51da..efb5c6317b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorLongLong.java
@@ -39,9 +39,4 @@ protected Boolean execute(Object left, Object right) {
 
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorLongLong(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorStringString.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorStringString.java
index bf7438d569..e15f95896a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorStringString.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/compare/notequal/NotEqualCompareConditionExpressionExecutorStringString.java
@@ -35,9 +35,4 @@ protected Boolean execute(Object left, Object right) {
         return !(left.equals(right));
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new NotEqualCompareConditionExpressionExecutorStringString(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CastFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CastFunctionExecutor.java
index 2a72c78522..aa0ed69ff1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CastFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CastFunctionExecutor.java
@@ -27,11 +27,11 @@
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for Siddhi cast function. Converts the given parameter according to the castTo parameter.
  * Incompatible arguments cause {@link ClassCastException} if further processed.
@@ -69,8 +69,8 @@ public class CastFunctionExecutor extends FunctionExecutor {
     private Attribute.Type returnType = Attribute.Type.OBJECT;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 2) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to common:cast() function, " +
                     "required 2 parameters, but found " +
@@ -99,10 +99,11 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                         "string");
             }
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         if (returnType == Attribute.Type.LONG && data[0] instanceof Integer) {
             return ((Integer) data[0]).longValue();
         }
@@ -110,7 +111,7 @@ protected Object execute(Object[] data) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return null;
     }
 
@@ -119,15 +120,6 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;    //No need to maintain a state.
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Since there's no need to maintain a state, nothing needs to be done here.
-    }
 }
 
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CoalesceFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CoalesceFunctionExecutor.java
index 06720c5bda..c709da0dc2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CoalesceFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CoalesceFunctionExecutor.java
@@ -25,11 +25,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for coalesce function. Returns the value of the first input parameter that is not null.
  */
@@ -73,8 +73,8 @@ public class CoalesceFunctionExecutor extends FunctionExecutor {
     private Attribute.Type returnType;
 
     @Override
-    public void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                     SiddhiQueryContext siddhiQueryContext) {
+    public StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                             SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length == 0) {
             throw new SiddhiAppValidationException("Coalesce must have at least one parameter");
         }
@@ -85,6 +85,7 @@ public void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader
             }
         }
         returnType = type;
+        return null;
     }
 
     @Override
@@ -93,7 +94,7 @@ public Attribute.Type getReturnType() {
     }
 
 
-    protected Object execute(Object[] obj) {
+    protected Object execute(Object[] obj, State state) {
         for (Object aObj : obj) {
             if (aObj != null) {
                 return aObj;
@@ -103,18 +104,7 @@ protected Object execute(Object[] obj) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data;
     }
-
-    @Override
-    public Map<String, Object> currentState() {
-        //No states
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/ConvertFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/ConvertFunctionExecutor.java
index c556bb2bf8..a5198d7c13 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/ConvertFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/ConvertFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for convert function. Function execution logic is implemented in execute here.
  */
@@ -73,8 +73,8 @@ public class ConvertFunctionExecutor extends FunctionExecutor {
     private Attribute.Type inputType;
 
     @Override
-    public void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                     SiddhiQueryContext siddhiQueryContext) {
+    public StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                             SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 2) {
             throw new SiddhiAppValidationException("convert() must have at 2 parameters, attribute and to be " +
                     "converted type");
@@ -115,6 +115,7 @@ public void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader
                     "(STRING, INT, LONG, FLOAT, DOUBLE, BOOL), but found '" +
                     type + "'");
         }
+        return null;
     }
 
     @Override
@@ -123,7 +124,7 @@ public Attribute.Type getReturnType() {
     }
 
 
-    protected Object execute(Object[] obj) {
+    protected Object execute(Object[] obj, State state) {
         Object data = obj[0];
         if (data != null) {
             try {
@@ -231,19 +232,8 @@ protected Object execute(Object[] obj) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         //will not occur
         return null;
     }
-
-    @Override
-    public Map<String, Object> currentState() {
-        //No states
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CreateSetFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CreateSetFunctionExecutor.java
index b67deffe98..2d5d7ad3fe 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CreateSetFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CreateSetFunctionExecutor.java
@@ -27,11 +27,12 @@
 import io.siddhi.core.exception.OperationNotSupportedException;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -61,8 +62,8 @@
 public class CreateSetFunctionExecutor extends FunctionExecutor {
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("createSet() function has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length + " parameters provided");
@@ -71,10 +72,11 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             throw new OperationNotSupportedException("createSet() function not supported for type: " +
                     attributeExpressionExecutors[0].getReturnType());
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the createSet function takes in only 1 parameter, this method does not get called.
         // Hence, not implemented.
     }
@@ -83,10 +85,11 @@ protected Object execute(Object[] data) {
      * return set object, containing only one element: data.
      *
      * @param data array of Double values
+     * @param state
      * @return the set object
      */
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         Set set = new HashSet();
         set.add(data);
         return set;
@@ -97,16 +100,6 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.OBJECT;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;    //no state is maintained.
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Does nothing as no state is maintained.
-    }
-
     private boolean isAttributeTypeSupported(Attribute.Type type) {
         switch (type) {
             case FLOAT:
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CurrentTimeMillisFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CurrentTimeMillisFunctionExecutor.java
index cf7bbd9e26..f08476181b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CurrentTimeMillisFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/CurrentTimeMillisFunctionExecutor.java
@@ -26,12 +26,12 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.core.util.timestamp.TimestampGenerator;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for getting Siddhi application timestamp.
  */
@@ -56,14 +56,15 @@ public class CurrentTimeMillisFunctionExecutor extends FunctionExecutor {
     private TimestampGenerator timestampGenerator;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 0) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to eventTimestamp() function, " +
                     "required 0 parameters, but found " +
                     attributeExpressionExecutors.length);
         }
         timestampGenerator = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator();
+        return null;
     }
 
     @Override
@@ -72,13 +73,13 @@ public Object execute(ComplexEvent event) {
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         //will not occur
         return null;
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         //will not occur
         return null;
     }
@@ -87,16 +88,6 @@ protected Object execute(Object data) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.LONG;
     }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return null;    //No need to maintain a state.
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Since there's no need to maintain a state, nothing needs to be done here.
-    }
 }
 
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/DefaultFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/DefaultFunctionExecutor.java
index 1bca93f953..baf6b21b90 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/DefaultFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/DefaultFunctionExecutor.java
@@ -26,12 +26,12 @@
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
-
 /**
  * Executor class for default function. Function execution sets the default value assigned by the user when attribute
  * value is null.
@@ -66,8 +66,8 @@ public class DefaultFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors,
-                        ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors,
+                                ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 2) {
             // check whether all the arguments passed
             throw new SiddhiAppValidationException("Invalid no of parameters passed to default() function, " +
@@ -87,10 +87,11 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors,
                     attributeExpressionExecutors[1].getReturnType());
         }
         returnType = attributeExpressionExecutors[0].getReturnType();
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         if (data[0] == null) {
             return data[1];
         } else {
@@ -99,7 +100,7 @@ protected Object execute(Object[] data) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         //this will not occur
         return null;
     }
@@ -109,14 +110,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null; // No need to maintain a state.
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        // Since there's no need to maintain a state, nothing needs to be done here.
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/EventTimestampFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/EventTimestampFunctionExecutor.java
index 80239c47ae..95c8cd8cf4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/EventTimestampFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/EventTimestampFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for Siddhi cast function. Converts the given parameter according to the castTo parameter.
  * Incompatible arguments cause {@link ClassCastException} if further processed.
@@ -54,13 +54,14 @@
 public class EventTimestampFunctionExecutor extends FunctionExecutor {
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 0) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to eventTimestamp() function, " +
                     "required 0 parameters, but found " +
                     attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
@@ -69,13 +70,13 @@ public Object execute(ComplexEvent event) {
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         //will not occur
         return null;
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         //will not occur
         return null;
     }
@@ -85,15 +86,6 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.LONG;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;    //No need to maintain a state.
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Since there's no need to maintain a state, nothing needs to be done here.
-    }
 }
 
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/FunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/FunctionExecutor.java
index 086a43e703..1d8a8a9d46 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/FunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/FunctionExecutor.java
@@ -24,63 +24,43 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import org.apache.log4j.Logger;
 
 /**
  * Parent abstract class for Function Executors. Function executor will have one or more input parameters and single
  * return value.
+ * @param <S> current state for the Function Executor
  */
-public abstract class FunctionExecutor implements ExpressionExecutor, Snapshotable {
+public abstract class FunctionExecutor<S extends State> implements ExpressionExecutor {
 
     private static final Logger log = Logger.getLogger(FunctionExecutor.class);
     protected ExpressionExecutor[] attributeExpressionExecutors;
     protected SiddhiQueryContext siddhiQueryContext;
-    protected String elementId;
     protected String functionId;
     protected ProcessingMode processingMode;
     private ConfigReader configReader;
     private int attributeSize;
+    private StateHolder<S> stateHolder;
 
     public void initExecutor(ExpressionExecutor[] attributeExpressionExecutors,
                              ProcessingMode processingMode, ConfigReader configReader,
-                             SiddhiQueryContext siddhiQueryContext) {
+                             boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
         this.processingMode = processingMode;
         this.configReader = configReader;
         this.siddhiQueryContext = siddhiQueryContext;
         try {
             this.attributeExpressionExecutors = attributeExpressionExecutors;
             attributeSize = attributeExpressionExecutors.length;
-            if (elementId == null) {
-                elementId = "FunctionExecutor-" + this.siddhiQueryContext.getSiddhiAppContext().
-                        getElementIdGenerator().createNewId();
-            }
-            this.siddhiQueryContext.getSiddhiAppContext().getSnapshotService().addSnapshotable(
-                    siddhiQueryContext.getName(), this);
-            init(attributeExpressionExecutors, configReader, this.siddhiQueryContext);
+            StateFactory<S> stateFactory = init(attributeExpressionExecutors, configReader, this.siddhiQueryContext);
+            stateHolder = this.siddhiQueryContext.generateStateHolder(this.getClass().getName(), groupBy, stateFactory);
         } catch (Throwable t) {
             throw new SiddhiAppCreationException(t);
         }
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        try {
-            FunctionExecutor functionExecutor = this.getClass().newInstance();
-            ExpressionExecutor[] innerExpressionExecutors = new ExpressionExecutor[attributeSize];
-            for (int i = 0; i < attributeSize; i++) {
-                innerExpressionExecutors[i] = attributeExpressionExecutors[i].cloneExecutor(key);
-            }
-            functionExecutor.elementId = elementId + "-" + key;
-            functionExecutor.functionId = functionId;
-            functionExecutor.initExecutor(innerExpressionExecutors, processingMode,
-                    configReader, siddhiQueryContext);
-            return functionExecutor;
-        } catch (Exception e) {
-            throw new SiddhiAppRuntimeException("Exception in cloning " + this.getClass().getCanonicalName(), e);
-        }
-    }
-
     /**
      * The initialization method for FunctionExecutor, this method will be called before the other methods
      *
@@ -88,8 +68,9 @@ public ExpressionExecutor cloneExecutor(String key) {
      * @param configReader                 This hold the {@link FunctionExecutor} extensions configuration reader.
      * @param siddhiQueryContext           the context of the siddhi query
      */
-    protected abstract void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                                 SiddhiQueryContext siddhiQueryContext);
+    protected abstract StateFactory<S> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                            ConfigReader configReader,
+                                            SiddhiQueryContext siddhiQueryContext);
 
     /**
      * The main execution method which will be called upon event arrival
@@ -100,17 +81,22 @@ protected abstract void init(ExpressionExecutor[] attributeExpressionExecutors,
     @Override
     public Object execute(ComplexEvent event) {
         try {
-            switch (attributeSize) {
-                case 0:
-                    return execute((Object) null);
-                case 1:
-                    return execute(attributeExpressionExecutors[0].execute(event));
-                default:
-                    Object[] data = new Object[attributeSize];
-                    for (int i = 0; i < attributeSize; i++) {
-                        data[i] = attributeExpressionExecutors[i].execute(event);
-                    }
-                    return execute(data);
+            S state = stateHolder.getState();
+            try {
+                switch (attributeSize) {
+                    case 0:
+                        return execute((Object) null, state);
+                    case 1:
+                        return execute(attributeExpressionExecutors[0].execute(event), state);
+                    default:
+                        Object[] data = new Object[attributeSize];
+                        for (int i = 0; i < attributeSize; i++) {
+                            data[i] = attributeExpressionExecutors[i].execute(event);
+                        }
+                        return execute(data, state);
+                }
+            } finally {
+                stateHolder.returnState(state);
             }
         } catch (Exception e) {
             throw new SiddhiAppRuntimeException(e.getMessage() + ". Exception on class '" + this.getClass().getName()
@@ -125,7 +111,14 @@ public Object execute(ComplexEvent event) {
      * @param data the runtime values of function parameters
      * @return the function result
      */
-    protected abstract Object execute(Object[] data);
+    protected Object execute(Object[] data) {
+        S state = stateHolder.getState();
+        try {
+            return execute(data, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
 
     /**
      * The main execution method which will be called upon event arrival
@@ -135,19 +128,33 @@ public Object execute(ComplexEvent event) {
      *             runtime data value of the function parameter
      * @return the function result
      */
-    protected abstract Object execute(Object data);
-
-    @Override
-    public String getElementId() {
-        return elementId;
-    }
-
-    @Override
-    public void clean() {
-        for (ExpressionExecutor expressionExecutor : attributeExpressionExecutors) {
-            expressionExecutor.clean();
+    protected Object execute(Object data) {
+        S state = stateHolder.getState();
+        try {
+            return execute(data, state);
+        } finally {
+            stateHolder.returnState(state);
         }
-        siddhiQueryContext.getSiddhiAppContext().getSnapshotService().removeSnapshotable(
-                siddhiQueryContext.getName(), this);
     }
+
+    /**
+     * The main execution method which will be called upon event arrival
+     * when there are more then one function parameter
+     *
+     * @param data  the runtime values of function parameters
+     * @param state current query state
+     * @return the function result
+     */
+    protected abstract Object execute(Object[] data, S state);
+
+    /**
+     * The main execution method which will be called upon event arrival
+     * when there are zero or one function parameter
+     *
+     * @param data  null if the function parameter count is zero or
+     *              runtime data value of the function parameter
+     * @param state current query state
+     * @return the function result
+     */
+    protected abstract Object execute(Object data, S state);
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/IfThenElseFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/IfThenElseFunctionExecutor.java
index f03fb9410a..306b72ca9a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/IfThenElseFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/IfThenElseFunctionExecutor.java
@@ -27,12 +27,12 @@
 import io.siddhi.core.exception.SiddhiAppRuntimeException;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
-
 /**
  * Executor class for ifThenElse function. Function execution logic is implemented in execute here.
  */
@@ -90,8 +90,8 @@ public class IfThenElseFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors,
-                        ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors,
+                                ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 3) {
             // check whether all the arguments passed
             throw new SiddhiAppValidationException("Invalid no of arguments passed to ifThenElse() function, " +
@@ -110,10 +110,11 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors,
         } else {
             returnType = attributeExpressionExecutors[1].getReturnType();
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         // check whether first argument true or null
         if (Boolean.TRUE.equals(data[0])) {
             return data[1];
@@ -123,7 +124,7 @@ protected Object execute(Object[] data) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         // Since the e function takes in multiple parameters, this method does not get called. Hence, not implemented.
         return null;
     }
@@ -133,16 +134,6 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null; // No need to maintain a state.
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        // Since there's no need to maintain a state, nothing needs to be done here.
-    }
-
     @Override
     public Object execute(ComplexEvent event) {
         try {
@@ -152,8 +143,7 @@ public Object execute(ComplexEvent event) {
                             condition,
                             (condition) ? attributeExpressionExecutors[1].execute(event) : null,
                             (!condition) ? attributeExpressionExecutors[2].execute(event) : null
-                    }
-            );
+                    });
         } catch (Exception e) {
             throw new SiddhiAppRuntimeException(e.getMessage() + ". Exception on class '" + this.getClass().getName()
                     + "'", e);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfBooleanFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfBooleanFunctionExecutor.java
index 5537f1d613..0ff4f40ae7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfBooleanFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfBooleanFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for instanceOf Boolean function. Function execution logic is implemented in execute here.
  */
@@ -69,23 +69,24 @@ public class InstanceOfBooleanFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType = Attribute.Type.BOOL;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to instanceOfBoolean() " +
                     "function, " +
                     "required only 1, but found " + attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the instanceOfBoolean function takes in 1 parameter, this method does not get called.
         // Hence, not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data instanceof Boolean;
     }
 
@@ -94,13 +95,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfDoubleFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfDoubleFunctionExecutor.java
index 617f683efe..17ecc06650 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfDoubleFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfDoubleFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for instanceOf Double function. Function execution logic is implemented in execute here.
  */
@@ -69,22 +69,23 @@ public class InstanceOfDoubleFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType = Attribute.Type.BOOL;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to instanceOfDouble() " +
                     "function, required only 1, but found " + attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the instanceOfDouble function takes in 1 parameter, this method does not get called.
         // Hence, not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data instanceof Double;
     }
 
@@ -93,13 +94,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfFloatFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfFloatFunctionExecutor.java
index d7c4dfdf60..5bca3a1552 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfFloatFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfFloatFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for instanceOf Double function. Function execution logic is implemented in execute here.
  */
@@ -68,22 +68,23 @@ public class InstanceOfFloatFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType = Attribute.Type.BOOL;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to instanceOfFloat() " +
                     "function, required only 1, but found " + attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the instanceOfFloat function takes in 1 parameter, this method does not get called. Hence,
         // not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data instanceof Float;
     }
 
@@ -92,13 +93,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfIntegerFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfIntegerFunctionExecutor.java
index d99998b4e5..b1a48553e4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfIntegerFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfIntegerFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for instanceOf Integer function. Function execution logic is implemented in execute here.
  */
@@ -69,22 +69,23 @@ public class InstanceOfIntegerFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType = Attribute.Type.BOOL;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to instanceOfInteger() " +
                     "function, required only 1, but found " + attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the instanceOfInteger function takes in 1 parameter, this method does not get called.
         // Hence, not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data instanceof Integer;
     }
 
@@ -93,13 +94,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfLongFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfLongFunctionExecutor.java
index 8b6d64a065..fb8ffc1559 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfLongFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfLongFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for instanceOf Long function. Function execution logic is implemented in execute here.
  */
@@ -68,22 +68,23 @@ public class InstanceOfLongFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType = Attribute.Type.BOOL;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to instanceOfLong() function, " +
                     "required only 1, but found " + attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the instanceOfLong function takes in 1 parameter, this method does not get called. Hence,
         // not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data instanceof Long;
     }
 
@@ -92,13 +93,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfStringFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfStringFunctionExecutor.java
index bfda93bf15..78e352b235 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfStringFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/InstanceOfStringFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for instanceOf String function. Function execution logic is implemented in execute here.
  */
@@ -69,22 +69,23 @@ public class InstanceOfStringFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType = Attribute.Type.BOOL;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("Invalid no of arguments passed to instanceOfString() " +
                     "function, required only 1, but found " + attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the instanceOfString function takes in 1 parameter, this method does not get called.
         // Hence, not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data instanceof java.lang.String;
     }
 
@@ -93,13 +94,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/MaximumFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/MaximumFunctionExecutor.java
index b123b85545..4577bbd1b1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/MaximumFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/MaximumFunctionExecutor.java
@@ -26,11 +26,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for Maximum function. Function execution logic is implemented in execute here.
  */
@@ -60,8 +60,8 @@ public class MaximumFunctionExecutor extends FunctionExecutor {
     private Attribute.Type returnType;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         Attribute.Type attributeTypeOne = attributeExpressionExecutors[0].getReturnType();
         if (!((attributeTypeOne == Attribute.Type.DOUBLE) || (attributeTypeOne == Attribute.Type.INT) ||
                 (attributeTypeOne == Attribute.Type.FLOAT) || (attributeTypeOne == Attribute.Type.LONG))) {
@@ -89,16 +89,18 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
 
         }
         returnType = attributeTypeOne;
+        return null;
     }
 
     /**
      * return maximum of arbitrary long set of Double values
      *
      * @param data array of Double values
+     * @param state
      * @return max
      */
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
 
         double max = Double.MIN_VALUE;
         for (Object aObj : data) {
@@ -133,7 +135,7 @@ protected Object execute(Object[] data) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data;
     }
 
@@ -142,13 +144,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/MinimumFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/MinimumFunctionExecutor.java
index 7b5c3f66ec..996c87e106 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/MinimumFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/MinimumFunctionExecutor.java
@@ -27,11 +27,11 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for Minimum function. Function execution logic is implemented in execute here.
  */
@@ -63,8 +63,8 @@ public class MinimumFunctionExecutor extends FunctionExecutor {
     private Attribute.Type returnType;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         Attribute.Type attributeTypeOne = attributeExpressionExecutors[0].getReturnType();
         if (!((attributeTypeOne == Attribute.Type.DOUBLE) || (attributeTypeOne == Attribute.Type.INT) ||
                 (attributeTypeOne == Attribute.Type.FLOAT) || (attributeTypeOne == Attribute.Type.LONG))) {
@@ -90,16 +90,18 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
 
         }
         returnType = attributeTypeOne;
+        return null;
     }
 
     /**
      * return maximum of arbitrary long set of Double values
      *
      * @param data array of Double values
+     * @param state
      * @return max
      */
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         double min = Double.MAX_VALUE;
         for (Object aObj : data) {
             Double value = Double.MAX_VALUE;
@@ -133,7 +135,7 @@ protected Object execute(Object[] data) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data;
     }
 
@@ -142,13 +144,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/ScriptFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/ScriptFunctionExecutor.java
index dece3d493c..7e89173186 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/ScriptFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/ScriptFunctionExecutor.java
@@ -22,11 +22,11 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.function.Script;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
-
 /**
  * Executor class for Script function. Function execution logic is implemented in execute here.
  */
@@ -49,29 +49,21 @@ public Attribute.Type getReturnType() {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         returnType = siddhiQueryContext.getSiddhiAppContext().getScript(functionId).getReturnType();
         script = siddhiQueryContext.getSiddhiAppContext().getScript(functionId);
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return script.eval(functionId, data);
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return script.eval(functionId, new Object[]{data});
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/SizeOfSetFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/SizeOfSetFunctionExecutor.java
index fdc8088eff..c2669f49e5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/SizeOfSetFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/SizeOfSetFunctionExecutor.java
@@ -28,10 +28,11 @@
 import io.siddhi.core.exception.SiddhiAppRuntimeException;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -70,8 +71,8 @@
 public class SizeOfSetFunctionExecutor extends FunctionExecutor {
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("sizeOfSet() function has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length + " parameters provided");
@@ -80,22 +81,24 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             throw new OperationNotSupportedException("Parameter given for sizeOfSet() function has to be of type " +
                     "object, but found: " + attributeExpressionExecutors[0].getReturnType());
         }
+        return null;
     }
 
     /**
      * return maximum of arbitrary long set of Double values
      *
      * @param data array of Double values
+     * @param state
      * @return max
      */
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the sizeOfSet function takes in only 1 parameter, this method does not get called.
         // Hence, not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         if (data == null) {
             return 0;
         }
@@ -112,13 +115,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.INT;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;    //no state is maintained.
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Does nothing as no state is maintained.
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/UUIDFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/UUIDFunctionExecutor.java
index 90eccdcdec..a363de7356 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/UUIDFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/function/UUIDFunctionExecutor.java
@@ -25,9 +25,10 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
-import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -58,19 +59,20 @@ public class UUIDFunctionExecutor extends FunctionExecutor {
     Attribute.Type returnType = Attribute.Type.STRING;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors,
-                        ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors,
+                                ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
         //Nothing to be done.
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the e function takes in no parameters, this method does not get called. Hence, not
         // implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return UUID.randomUUID().toString();
     }
 
@@ -79,13 +81,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null; //No need to maintain a state.
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Since there's no need to maintain a state, nothing needs to be done here.
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalAggregateBaseTimeFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalAggregateBaseTimeFunctionExecutor.java
index f4f9a568e3..2b796f5029 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalAggregateBaseTimeFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalAggregateBaseTimeFunctionExecutor.java
@@ -24,12 +24,12 @@
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.IncrementalTimeConverterUtil;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.aggregation.TimePeriod;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /**
  * Executor class for finding the start time and end time of the within clause in incremental processing.
  * This is important when retrieving incremental aggregate values by specifying a time range with 'within' clause.
@@ -37,8 +37,8 @@
 public class IncrementalAggregateBaseTimeFunctionExecutor extends FunctionExecutor {
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 2) {
             throw new SiddhiAppValidationException("incrementalAggregator:getAggregationStartTime() function accepts " +
                     "two arguments, but found " + attributeExpressionExecutors.length);
@@ -48,10 +48,11 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                     "incrementalAggregator:getAggregationStartTime() function accepts should be of type 'STRING', " +
                     "but found '" + attributeExpressionExecutors[1].getReturnType() + "'.");
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         long time = (long) data[0];
         String durationName = (String) data[1];
         TimePeriod.Duration duration;
@@ -83,7 +84,7 @@ protected Object execute(Object[] data) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         //More than one attribute executors
         return null;
     }
@@ -92,14 +93,4 @@ protected Object execute(Object data) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.OBJECT;
     }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return null; // No states
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        // Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalShouldUpdateFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalShouldUpdateFunctionExecutor.java
index e6e0c933c7..29ddc949b3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalShouldUpdateFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalShouldUpdateFunctionExecutor.java
@@ -22,6 +22,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
@@ -31,12 +33,12 @@
 /**
  * Execute class for shouldUpdate() function.
  */
-public class IncrementalShouldUpdateFunctionExecutor extends FunctionExecutor {
-    private long lastTimestamp = 0;
+public class IncrementalShouldUpdateFunctionExecutor
+        extends FunctionExecutor<IncrementalShouldUpdateFunctionExecutor.FunctionState> {
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<FunctionState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                               ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("shouldUpdate() function has to have exactly 1 parameter, " +
                     "currently " + attributeExpressionExecutors.length + " parameters provided");
@@ -45,10 +47,11 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             throw new OperationNotSupportedException("Parameter given for shouldUpdate() function has to be of type " +
                     "long, but found: " + attributeExpressionExecutors[0].getReturnType());
         }
+        return () -> new FunctionState();
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, FunctionState state) {
         //will not occur
         return null;
     }
@@ -56,14 +59,15 @@ protected Object execute(Object[] data) {
     /**
      * return true/false based on timestamp values
      *
-     * @param data of Long type
+     * @param data  of Long type
+     * @param state function state
      * @return true/false
      */
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, FunctionState state) {
         long timestamp = (long) data;
-        if (timestamp >= this.lastTimestamp) {
-            this.lastTimestamp = timestamp;
+        if (timestamp >= state.lastTimestamp) {
+            state.lastTimestamp = timestamp;
             return true;
         }
         return false;
@@ -74,15 +78,24 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.BOOL;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        HashMap<String, Object> state = new HashMap<>();
-        state.put("lastTimestamp", this.lastTimestamp);
-        return state;
-    }
+    class FunctionState extends State {
+        private long lastTimestamp = 0;
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        this.lastTimestamp = ((long) state.get("lastTimestamp"));
+        @Override
+        public boolean canDestroy() {
+            return lastTimestamp == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            HashMap<String, Object> state = new HashMap<>();
+            state.put("lastTimestamp", this.lastTimestamp);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            this.lastTimestamp = ((long) state.get("lastTimestamp"));
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalStartTimeEndTimeFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalStartTimeEndTimeFunctionExecutor.java
index c402e86268..1e2f044e7a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalStartTimeEndTimeFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalStartTimeEndTimeFunctionExecutor.java
@@ -24,13 +24,14 @@
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.IncrementalTimeConverterUtil;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.aggregation.TimePeriod;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -73,8 +74,8 @@ private static List<Pattern> getSupportedRegexPatterns(int withinStringLength) {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length == 1) {
             if (attributeExpressionExecutors[0].getReturnType() != Attribute.Type.STRING) {
                 throw new SiddhiAppValidationException("Only string values are supported for single within clause "
@@ -95,10 +96,11 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             throw new SiddhiAppValidationException("incrementalAggregator:startTimeEndTime() function accepts " +
                     "only one or two arguments, but found " + attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         long startTime;
         long endTime;
 
@@ -122,7 +124,7 @@ protected Object execute(Object[] data) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return getStartTimeEndTime(data.toString().trim());
     }
 
@@ -131,16 +133,6 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.OBJECT;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null; // No states
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        // Nothing to be done
-    }
-
     private Long[] getStartTimeEndTime(String singleWithinTimeAsString) {
         long startTime;
         long endTime;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalTimeGetTimeZone.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalTimeGetTimeZone.java
index a986215479..a984c64300 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalTimeGetTimeZone.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalTimeGetTimeZone.java
@@ -23,12 +23,13 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
 import java.time.Instant;
 import java.time.ZoneOffset;
-import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -56,8 +57,8 @@ public static String getTimeZone(String stringTimeStamp) {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (!(attributeExpressionExecutors.length == 0 || attributeExpressionExecutors.length == 1)) {
             throw new SiddhiAppValidationException("incrementalAggregator:getTimeZone() function " +
                     "accepts zero or one argument, but found " + attributeExpressionExecutors.length);
@@ -68,16 +69,17 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                         "string values, but found " + attributeExpressionExecutors[0].getReturnType());
             }
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the getTimeZone function takes in 1 parameter, this method does not get called.
         // Hence, not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         if (data == null) {
             return ZoneOffset.systemDefault().getRules().getOffset(Instant.now()).getId();
         }
@@ -89,13 +91,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.STRING;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;    //No states
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalUnixTimeFunctionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalUnixTimeFunctionExecutor.java
index 7064e90b04..6e72f2f2d9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalUnixTimeFunctionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/incremental/IncrementalUnixTimeFunctionExecutor.java
@@ -23,6 +23,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
@@ -30,7 +32,6 @@
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -66,8 +67,8 @@ public static long getUnixTimeStamp(String stringTimeStamp) {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppValidationException("incrementalAggregator:timestampInMilliseconds() function " +
                     "accepts only one argument, but found " + attributeExpressionExecutors.length);
@@ -76,16 +77,17 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             throw new SiddhiAppValidationException("Only string values can be converted to unix time, but found " +
                     attributeExpressionExecutors[0].getReturnType());
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         return null; //Since the timestampInMilliseconds function takes in 1 parameter, this method does not get called.
         // Hence, not implemented.
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return getUnixTimeStamp(data.toString());
     }
 
@@ -94,13 +96,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.LONG;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;    //No states
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorDouble.java
index 2299c5e83f..9d97d1579f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorDouble.java
@@ -49,16 +49,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.DOUBLE;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new AddExpressionExecutorDouble(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorFloat.java
index c4885e21bf..c91716680e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorFloat.java
@@ -48,17 +48,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.FLOAT;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new AddExpressionExecutorFloat(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorInt.java
index b021456ada..902171ce57 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorInt.java
@@ -49,17 +49,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.INT;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new AddExpressionExecutorInt(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorLong.java
index fdd02b2e79..f1fd687cae 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/add/AddExpressionExecutorLong.java
@@ -50,16 +50,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.LONG;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new AddExpressionExecutorLong(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorDouble.java
index 7d0de39d07..0d10cf898b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorDouble.java
@@ -54,17 +54,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.DOUBLE;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new DivideExpressionExecutorDouble(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorFloat.java
index 6e15f4ecc1..4092bfadf1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorFloat.java
@@ -53,17 +53,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.FLOAT;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new DivideExpressionExecutorFloat(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorInt.java
index 5e508d0f9d..a6df3fd97c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorInt.java
@@ -53,17 +53,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.INT;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new DivideExpressionExecutorInt(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorLong.java
index b339ace70b..0538f4984f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/divide/DivideExpressionExecutorLong.java
@@ -53,17 +53,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.LONG;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new DivideExpressionExecutorLong(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorDouble.java
index 16146c471d..e84e5703a6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorDouble.java
@@ -52,18 +52,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.DOUBLE;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new ModExpressionExecutorDouble(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorFloat.java
index e09a070aa0..95e2894ca3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorFloat.java
@@ -52,18 +52,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.FLOAT;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new ModExpressionExecutorFloat(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorInt.java
index 5d60df1f49..10a4140da0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorInt.java
@@ -52,18 +52,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.INT;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new ModExpressionExecutorInt(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorLong.java
index f10d1b5325..cf47a9af45 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/mod/ModExpressionExecutorLong.java
@@ -52,18 +52,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.LONG;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new ModExpressionExecutorLong(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorDouble.java
index 0757e83746..8ae4bfa805 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorDouble.java
@@ -49,18 +49,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.DOUBLE;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new MultiplyExpressionExecutorDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorFloat.java
index 170e17dead..ed02f0bff2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorFloat.java
@@ -48,18 +48,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.FLOAT;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new MultiplyExpressionExecutorFloat(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorInt.java
index 73b4d86d4e..46e5679412 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorInt.java
@@ -50,17 +50,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.INT;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new MultiplyExpressionExecutorInt(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorLong.java
index 9283d906bf..6d5595bab4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/multiply/MultiplyExpressionExecutorLong.java
@@ -49,18 +49,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.LONG;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new MultiplyExpressionExecutorLong(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorDouble.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorDouble.java
index 47c1ec753d..18710494cb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorDouble.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorDouble.java
@@ -49,18 +49,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.DOUBLE;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new SubtractExpressionExecutorDouble(leftExpressionExecutor.cloneExecutor(key),
-                rightExpressionExecutor.cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorFloat.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorFloat.java
index 4998bccb73..fb9ff841fc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorFloat.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorFloat.java
@@ -48,18 +48,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.FLOAT;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new SubtractExpressionExecutorFloat(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorInt.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorInt.java
index e2999e1781..03c1f3d67d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorInt.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorInt.java
@@ -48,18 +48,4 @@ public Object execute(ComplexEvent event) {
     public Attribute.Type getReturnType() {
         return Attribute.Type.INT;
     }
-
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new SubtractExpressionExecutorInt(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorLong.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorLong.java
index ddd4c75ec6..7e85ca7fbf 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorLong.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/math/subtract/SubtractExpressionExecutorLong.java
@@ -49,17 +49,4 @@ public Attribute.Type getReturnType() {
         return Attribute.Type.LONG;
     }
 
-    @Override
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new SubtractExpressionExecutorLong(leftExpressionExecutor.cloneExecutor(key), rightExpressionExecutor
-                .cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        leftExpressionExecutor.clean();
-        rightExpressionExecutor.clean();
-    }
-
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionInstanceRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionInstanceRuntime.java
deleted file mode 100644
index 3d29d2770b..0000000000
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionInstanceRuntime.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.core.partition;
-
-import io.siddhi.core.query.QueryRuntime;
-
-import java.util.List;
-
-/**
- * Class to represent each partition key instance. These will be created dynamically and will contain
- * {@link QueryRuntime}s belonging to that partition key.
- */
-public class PartitionInstanceRuntime {
-    private String key;
-    private List<QueryRuntime> queryRuntimeList;
-
-    public PartitionInstanceRuntime(String key, List<QueryRuntime> queryRuntimeList) {
-        this.key = key;
-        this.queryRuntimeList = queryRuntimeList;
-    }
-
-    public List<QueryRuntime> getQueryRuntimeList() {
-        return queryRuntimeList;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-}
-
-
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
index e4b60df7fb..ba674e654d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
@@ -33,7 +33,8 @@
 import io.siddhi.core.util.SiddhiConstants;
 import io.siddhi.core.util.parser.helper.DefinitionParserHelper;
 import io.siddhi.core.util.parser.helper.QueryParserHelper;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.core.util.statistics.MemoryUsageTracker;
 import io.siddhi.query.api.annotation.Element;
 import io.siddhi.query.api.definition.AbstractDefinition;
@@ -55,9 +56,10 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -65,32 +67,31 @@
  * Runtime class to handle partitioning. It will hold all information regarding current partitions and wil create
  * partition dynamically during runtime.
  */
-public class PartitionRuntime implements Snapshotable {
+public class PartitionRuntime {
 
 
-    private String partitionId;
-    private String elementId;
+    private final StateHolder<PartitionState> stateHolder;
+    private String partitionName;
     private Partition partition;
     private ConcurrentMap<String, StreamJunction> localStreamJunctionMap = new ConcurrentHashMap<String,
-            StreamJunction>(); //contains definition
+            StreamJunction>();
+    private ConcurrentMap<String, StreamJunction> innerpartitionStreamReceiverStreamJunctionMap =
+            new ConcurrentHashMap<String, StreamJunction>();
+    //contains definition
     private ConcurrentMap<String, AbstractDefinition> localStreamDefinitionMap = new ConcurrentHashMap<String,
             AbstractDefinition>(); //contains stream definition
     private ConcurrentMap<String, AbstractDefinition> streamDefinitionMap;
     private ConcurrentMap<String, AbstractDefinition> windowDefinitionMap;
     private ConcurrentMap<String, StreamJunction> streamJunctionMap;
-    private ConcurrentMap<String, QueryRuntime> metaQueryRuntimeMap = new ConcurrentHashMap<String, QueryRuntime>();
-    private ConcurrentMap<String, PartitionInstanceRuntime> partitionInstanceRuntimeMap = new
-            ConcurrentHashMap<String, PartitionInstanceRuntime>();
+    private List<QueryRuntime> queryRuntimeList = new ArrayList<QueryRuntime>();
     private ConcurrentMap<String, PartitionStreamReceiver> partitionStreamReceivers = new ConcurrentHashMap<String,
             PartitionStreamReceiver>();
     private SiddhiAppContext siddhiAppContext;
-    private MemoryUsageTracker memoryUsageTracker;
-    public static ThreadLocal<String> partitionKey= new ThreadLocal<>();
 
     public PartitionRuntime(ConcurrentMap<String, AbstractDefinition> streamDefinitionMap,
                             ConcurrentMap<String, AbstractDefinition> windowDefinitionMap,
                             ConcurrentMap<String, StreamJunction> streamJunctionMap,
-                            Partition partition, SiddhiAppContext siddhiAppContext) {
+                            Partition partition, int partitionIndex, SiddhiAppContext siddhiAppContext) {
         this.siddhiAppContext = siddhiAppContext;
         if (partition.getPartitionTypeMap().isEmpty()) {
             throw new SiddhiAppCreationException("Partition must have at least one executor. But found none.");
@@ -99,25 +100,25 @@ public PartitionRuntime(ConcurrentMap<String, AbstractDefinition> streamDefiniti
             Element element = AnnotationHelper.getAnnotationElement("info", "name",
                     partition.getAnnotations());
             if (element != null) {
-                this.partitionId = element.getValue();
+                this.partitionName = element.getValue();
             }
         } catch (DuplicateAnnotationException e) {
             throw new DuplicateAnnotationException(e.getMessageWithOutContext() + " for the same Query " +
                     partition.toString(), e, e.getQueryContextStartIndex(), e.getQueryContextEndIndex(),
                     siddhiAppContext.getName(), siddhiAppContext.getSiddhiAppString());
         }
-        if (partitionId == null) {
-            this.partitionId = UUID.randomUUID().toString();
+        if (partitionName == null) {
+            this.partitionName = "partition_" + partitionIndex;
         }
-        elementId = "PartitionRuntime-" + siddhiAppContext.getElementIdGenerator().createNewId();
-        siddhiAppContext.getSnapshotService().addSnapshotable("partition", this);
         this.partition = partition;
         this.streamDefinitionMap = streamDefinitionMap;
         this.windowDefinitionMap = windowDefinitionMap;
         this.streamJunctionMap = streamJunctionMap;
+
+        this.stateHolder = siddhiAppContext.generateStateHolder(partitionName, () -> new PartitionState());
     }
 
-    public QueryRuntime addQuery(QueryRuntime metaQueryRuntime) {
+    public void addQuery(QueryRuntime metaQueryRuntime) {
         Query query = metaQueryRuntime.getQuery();
 
         if (query.getOutputStream() instanceof InsertIntoStream &&
@@ -175,9 +176,36 @@ public QueryRuntime addQuery(QueryRuntime metaQueryRuntime) {
             insertIntoWindowCallback.getWindow().setPublisher(streamJunctionMap.get(insertIntoWindowCallback
                     .getOutputStreamDefinition().getId()).constructPublisher());
         }
-        metaQueryRuntimeMap.put(metaQueryRuntime.getQueryId(), metaQueryRuntime);
 
-        return metaQueryRuntime;
+        if (metaQueryRuntime.isFromLocalStream()) {
+            for (int i = 0; i < metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().size(); i++) {
+                String streamId = metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get(i)
+                        .getProcessStreamReceiver().getStreamId();
+                StreamDefinition streamDefinition = null;
+                if (streamId.startsWith("#")) {
+                    streamDefinition = (StreamDefinition) localStreamDefinitionMap.get(streamId);
+
+//                else {
+//                    streamDefinition = (StreamDefinition) streamDefinitionMap.get(streamId);
+//                    if (streamDefinition == null) {
+//                        streamDefinition = (StreamDefinition) windowDefinitionMap.get(streamId);
+//                    }
+//                }
+                    StreamJunction streamJunction = localStreamJunctionMap.get(streamId);
+                    if (streamJunction == null) {
+                        streamJunction = new StreamJunction(streamDefinition, siddhiAppContext
+                                .getExecutorService(),
+                                siddhiAppContext.getBufferSize(),
+                                null, siddhiAppContext);
+                        localStreamJunctionMap.put(streamId, streamJunction);
+                    }
+                    streamJunction.subscribe(metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get
+                            (i).getProcessStreamReceiver());
+                }
+            }
+        }
+
+        queryRuntimeList.add(metaQueryRuntime);
     }
 
     public void addPartitionReceiver(QueryRuntime queryRuntime, List<VariableExpressionExecutor> executors,
@@ -205,8 +233,8 @@ public void addPartitionReceiver(QueryRuntime queryRuntime, List<VariableExpress
     }
 
     private int addPartitionReceiverForStateElement(StateElement stateElement, MetaStateEvent metaEvent,
-                                                    List<List<PartitionExecutor>> partitionExecutors, int
-                                                            executorIndex) {
+                                                    List<List<PartitionExecutor>> partitionExecutors,
+                                                    int executorIndex) {
         if (stateElement instanceof EveryStateElement) {
             return addPartitionReceiverForStateElement(((EveryStateElement) stateElement).getStateElement(),
                     metaEvent, partitionExecutors, executorIndex);
@@ -245,91 +273,126 @@ private void addPartitionReceiver(String streamId, boolean isInnerStream, MetaSt
             partitionStreamReceivers.put(partitionStreamReceiver.getStreamId(), partitionStreamReceiver);
             streamJunctionMap.get(partitionStreamReceiver.getStreamId()).subscribe(partitionStreamReceiver);
         }
-    }
 
 
-    /**
-     * clone all the queries of the partition for a given partition key if they are not available
-     *
-     * @param key partition key
-     */
-    public void cloneIfNotExist(String key) {
-        if (!partitionInstanceRuntimeMap.containsKey(key)) {
-            clonePartition(key);
-        }
+//
+//
+//        if (metaQueryRuntime.isFromLocalStream()) {
+//            for (int i = 0; i < metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().size(); i++) {
+//                String streamId = metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get(i)
+//                        .getProcessStreamReceiver().getStreamId();
+//                StreamDefinition streamDefinition = null;
+//                if (streamId.startsWith("#")) {
+//                    streamDefinition = (StreamDefinition) localStreamDefinitionMap.get(streamId);
+////                } else {
+////                    streamDefinition = (StreamDefinition) streamDefinitionMap.get(streamId);
+////                    if (streamDefinition == null) {
+////                        streamDefinition = (StreamDefinition) windowDefinitionMap.get(streamId);
+////                    }
+////                }
+//                    StreamJunction streamJunction = localStreamJunctionMap.get(streamId);
+//                    if (streamJunction == null) {
+//                        streamJunction = new StreamJunction(streamDefinition, siddhiAppContext
+//                                .getExecutorService(),
+//                                siddhiAppContext.getBufferSize(),
+//                                null, siddhiAppContext);
+//                        localStreamJunctionMap.put(streamId, streamJunction);
+//                    }
+//                    streamJunction.subscribe(metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get
+//                            (i).getProcessStreamReceiver());
+//                }
+//            }
+//        }
+//
+//        partitionStreamReceiver.addStreamJunction(queryRuntimeList);
     }
 
-    private synchronized void clonePartition(String key) {
-        PartitionInstanceRuntime partitionInstance = this.partitionInstanceRuntimeMap.get(key);
-
-        if (partitionInstance == null) {
-            List<QueryRuntime> queryRuntimeList = new ArrayList<QueryRuntime>();
-            List<QueryRuntime> partitionedQueryRuntimeList = new ArrayList<QueryRuntime>();
-
-            for (QueryRuntime queryRuntime : metaQueryRuntimeMap.values()) {
-
-                QueryRuntime clonedQueryRuntime = queryRuntime.clone(key, localStreamJunctionMap);
-                queryRuntimeList.add(clonedQueryRuntime);
-
-                QueryParserHelper.registerMemoryUsageTracking(clonedQueryRuntime.getQueryId(), queryRuntime,
-                        SiddhiConstants.METRIC_INFIX_QUERIES, siddhiAppContext, memoryUsageTracker);
-
-                if (queryRuntime.isFromLocalStream()) {
-                    for (int i = 0; i < clonedQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().size(); i++) {
-                        String streamId = queryRuntime.getStreamRuntime().getSingleStreamRuntimes().get(i)
-                                .getProcessStreamReceiver().getStreamId();
-                        StreamDefinition streamDefinition = null;
-                        if (streamId.startsWith("#")) {
-                            streamDefinition = (StreamDefinition) localStreamDefinitionMap.get(streamId);
-                        } else {
-                            streamDefinition = (StreamDefinition) streamDefinitionMap.get(streamId);
-                            if (streamDefinition == null) {
-                                streamDefinition = (StreamDefinition) windowDefinitionMap.get(streamId);
-                            }
-                        }
-                        StreamJunction streamJunction = localStreamJunctionMap.get(streamId + key);
-                        if (streamJunction == null) {
-                            streamJunction = new StreamJunction(streamDefinition, siddhiAppContext
-                                    .getExecutorService(),
-                                    siddhiAppContext.getBufferSize(),
-                                    null, siddhiAppContext);
-                            localStreamJunctionMap.put(streamId + key, streamJunction);
-                        }
-                        streamJunction.subscribe(clonedQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get
-                                (i).getProcessStreamReceiver());
-                    }
-                } else {
-                    partitionedQueryRuntimeList.add(clonedQueryRuntime);
-                }
-            }
-            partitionInstanceRuntimeMap.putIfAbsent(key, new PartitionInstanceRuntime(key, queryRuntimeList));
-            updatePartitionStreamReceivers(key, partitionedQueryRuntimeList);
-        }
-
+    private StreamJunction createStreamJunction(StreamDefinition streamDefinition) {
+        return new StreamJunction(streamDefinition, siddhiAppContext.getExecutorService(),
+                siddhiAppContext.getBufferSize(), null, siddhiAppContext);
     }
 
-    private void updatePartitionStreamReceivers(String key, List<QueryRuntime> partitionedQueryRuntimeList) {
-        for (PartitionStreamReceiver partitionStreamReceiver : partitionStreamReceivers.values()) {
-            partitionStreamReceiver.addStreamJunction(key, partitionedQueryRuntimeList);
-        }
+//    /**
+//     * clone all the queries of the partition for a given partition key if they are not available
+//     *
+//     * @param key partition key
+//     */
+//    public void cloneIfNotExist(String key) {
+//        if (!partitionInstanceRuntimeMap.containsKey(key)) {
+//            clonePartition(key);
+//        }
+//    }
+
+    //    private synchronized void clonePartition() {
+//        List<QueryRuntime> partitionedQueryRuntimeList = new ArrayList<QueryRuntime>();
+//
+//        for (QueryRuntime queryRuntime : metaQueryRuntimeMap.values()) {
+//
+////            QueryRuntime clonedQueryRuntime = queryRuntime.clone(key, localStreamJunctionMap);
+//            queryRuntimeList.add(queryRuntime);
+//
+//            QueryParserHelper.registerMemoryUsageTracking(clonedQueryRuntime.getQueryId(), queryRuntime,
+//                    SiddhiConstants.METRIC_INFIX_QUERIES, siddhiAppContext, memoryUsageTracker);
+//
+//            if (queryRuntime.isFromLocalStream()) {
+//                for (int i = 0; i < clonedQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().size(); i++) {
+//                    String streamId = queryRuntime.getStreamRuntime().getSingleStreamRuntimes().get(i)
+//                            .getProcessStreamReceiver().getStreamId();
+//                    StreamDefinition streamDefinition = null;
+//                    if (streamId.startsWith("#")) {
+//                        streamDefinition = (StreamDefinition) localStreamDefinitionMap.get(streamId);
+//                    } else {
+//                        streamDefinition = (StreamDefinition) streamDefinitionMap.get(streamId);
+//                        if (streamDefinition == null) {
+//                            streamDefinition = (StreamDefinition) windowDefinitionMap.get(streamId);
+//                        }
+//                    }
+//                    StreamJunction streamJunction = localStreamJunctionMap.get(streamId + key);
+//                    if (streamJunction == null) {
+//                        streamJunction = new StreamJunction(streamDefinition, siddhiAppContext
+//                                .getExecutorService(),
+//                                siddhiAppContext.getBufferSize(),
+//                                null, siddhiAppContext);
+//                        localStreamJunctionMap.put(streamId + key, streamJunction);
+//                    }
+//                    streamJunction.subscribe(clonedQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get
+//                            (i).getProcessStreamReceiver());
+//                }
+//            } else {
+//                partitionedQueryRuntimeList.add(clonedQueryRuntime);
+//            }
+//        }
+//        partitionInstanceRuntimeMap.putIfAbsent(key, new PartitionInstanceRuntime(key, queryRuntimeList));
+//        updatePartitionStreamReceivers(key, partitionedQueryRuntimeList);
+//    }
+//
+//    private void updatePartitionStreamReceivers(String key, List<QueryRuntime> partitionedQueryRuntimeList) {
+//        for (PartitionStreamReceiver partitionStreamReceiver : partitionStreamReceivers.values()) {
+//            partitionStreamReceiver.addStreamJunction(key, partitionedQueryRuntimeList);
+//        }
+//    }
+//
+//    public void addLocalStreamJunction(String key, StreamJunction streamJunction) {
+//        localStreamJunctionMap.put(key, streamJunction);
+//    }
+//
+    public void addInnerpartitionStreamReceiverStreamJunction(String key, StreamJunction streamJunction) {
+        innerpartitionStreamReceiverStreamJunctionMap.put(key, streamJunction);
     }
 
-    public void addStreamJunction(String key, StreamJunction streamJunction) {
-        localStreamJunctionMap.put(key, streamJunction);
+    public ConcurrentMap<String, StreamJunction> getInnerpartitionStreamReceiverStreamJunctionMap() {
+        return innerpartitionStreamReceiverStreamJunctionMap;
     }
 
     public void init() {
         for (PartitionStreamReceiver partitionStreamReceiver : partitionStreamReceivers.values()) {
+            partitionStreamReceiver.addStreamJunction(queryRuntimeList);
             partitionStreamReceiver.init();
         }
     }
 
-    public String getPartitionId() {
-        return partitionId;
-    }
-
-    public ConcurrentMap<String, QueryRuntime> getMetaQueryRuntimeMap() {
-        return metaQueryRuntimeMap;
+    public String getPartitionName() {
+        return partitionName;
     }
 
     public ConcurrentMap<String, AbstractDefinition> getLocalStreamDefinitionMap() {
@@ -340,33 +403,60 @@ public ConcurrentMap<String, StreamJunction> getLocalStreamJunctionMap() {
         return localStreamJunctionMap;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        List<String> partitionKeys = new ArrayList<>(partitionInstanceRuntimeMap.keySet());
-        state.put("PartitionKeys", partitionKeys);
-        return state;
-    }
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        List<String> partitionKeys = (List<String>) state.get("PartitionKeys");
-        for (String key : partitionKeys) {
-            clonePartition(key);
+    public void setMemoryUsageTracker(MemoryUsageTracker memoryUsageTracker) {
+        for (QueryRuntime queryRuntime : queryRuntimeList) {
+            QueryParserHelper.registerMemoryUsageTracking(queryRuntime.getQueryId(), queryRuntime,
+                    SiddhiConstants.METRIC_INFIX_QUERIES, siddhiAppContext, memoryUsageTracker);
         }
     }
 
-    @Override
-    public String getElementId() {
-        return elementId;
+    public void start() {
+        PartitionState state = stateHolder.getState();
+        try {
+            if (!state.partitionKeys.contains(SiddhiAppContext.getPartitionFlowId())) {
+                state.partitionKeys.add(SiddhiAppContext.getPartitionFlowId());
+                for (QueryRuntime queryRuntime : queryRuntimeList) {
+                    queryRuntime.start();
+                }
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
-    public void setMemoryUsageTracker(MemoryUsageTracker memoryUsageTracker) {
-        this.memoryUsageTracker = memoryUsageTracker;
+    public Set<String> getPartitionKeys() {
+        PartitionState state = stateHolder.getState();
+        try {
+            return state.partitionKeys;
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
-    @Override
-    public void clean() {
-        siddhiAppContext.getSnapshotService().removeSnapshotable("partition", this);
+    /**
+     * State of partition
+     */
+    public class PartitionState extends State {
+
+        private Set<String> partitionKeys = new HashSet<>();
+
+        @Override
+        public boolean canDestroy() {
+            return partitionKeys.isEmpty();
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("PartitionKeys", partitionKeys);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            partitionKeys = (Set<String>) state.get("PartitionKeys");
+        }
     }
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
index 51f9b2ac6b..55bc6cda6e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
@@ -32,9 +32,9 @@
 import io.siddhi.core.stream.StreamJunction;
 import io.siddhi.query.api.definition.StreamDefinition;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Specific {@link StreamJunction.Receiver} implementation to pump events into partitions. This will send the event
@@ -50,7 +50,7 @@ public class PartitionStreamReceiver implements StreamJunction.Receiver {
     private SiddhiAppContext siddhiAppContext;
     private PartitionRuntime partitionRuntime;
     private List<PartitionExecutor> partitionExecutors;
-    private Map<String, StreamJunction> cachedStreamJunctionMap = new ConcurrentHashMap<String, StreamJunction>();
+    private Map<String, StreamJunction> streamJunctionMap = new HashMap<>();
 
 
     public PartitionStreamReceiver(SiddhiAppContext siddhiAppContext, MetaStreamEvent metaStreamEvent,
@@ -269,20 +269,24 @@ public void receive(List<Event> events) {
 
     private void send(String key, ComplexEvent event) {
         if (key != null) {
-            //todo fix partition
-            PartitionRuntime.partitionKey.set(key);
+            SiddhiAppContext.startPartitionFlow(key);
             try {
-                partitionRuntime.cloneIfNotExist(key);
-                cachedStreamJunctionMap.get(streamId + key).sendEvent(event);
+                partitionRuntime.start();
+                streamJunctionMap.get(streamId).sendEvent(event);
             } finally {
-                PartitionRuntime.partitionKey.set(null);
+                SiddhiAppContext.stopPartitionFlow();
             }
         }
     }
 
     private void send(ComplexEvent event) {
-        for (StreamJunction streamJunction : cachedStreamJunctionMap.values()) {
-            streamJunction.sendEvent(event);
+        for (String key : partitionRuntime.getPartitionKeys()) {
+            SiddhiAppContext.startPartitionFlow(key);
+            try {
+                streamJunctionMap.get(streamId).sendEvent(event);
+            } finally {
+                SiddhiAppContext.stopPartitionFlow();
+            }
         }
     }
 
@@ -290,24 +294,27 @@ private void send(ComplexEvent event) {
      * create local streamJunctions through which events received by partitionStreamReceiver, are sent to
      * queryStreamReceivers
      *
-     * @param key              partitioning key
      * @param queryRuntimeList queryRuntime list of the partition
      */
-    public void addStreamJunction(String key, List<QueryRuntime> queryRuntimeList) {
-        StreamJunction streamJunction = cachedStreamJunctionMap.get(streamId + key);
+    public void addStreamJunction(List<QueryRuntime> queryRuntimeList) {
+        StreamJunction streamJunction = streamJunctionMap.get(streamId);
         if (streamJunction == null) {
-            streamJunction = partitionRuntime.getLocalStreamJunctionMap().get(streamId + key);
+            streamJunction = partitionRuntime.getInnerpartitionStreamReceiverStreamJunctionMap().get(streamId);
             if (streamJunction == null) {
                 streamJunction = createStreamJunction();
-                partitionRuntime.addStreamJunction(streamId + key, streamJunction);
+                partitionRuntime.addInnerpartitionStreamReceiverStreamJunction(streamId, streamJunction);
             }
-            cachedStreamJunctionMap.put(streamId + key, streamJunction);
+            streamJunctionMap.put(streamId , streamJunction);
         }
+//        if (streamJunction == null) {
+//            streamJunction = createStreamJunction();
+//            this.streamJunctionMap.put(streamId, streamJunction);
+//        }
         for (QueryRuntime queryRuntime : queryRuntimeList) {
             StreamRuntime streamRuntime = queryRuntime.getStreamRuntime();
             for (int i = 0; i < queryRuntime.getInputStreamId().size(); i++) {
                 if ((streamRuntime.getSingleStreamRuntimes().get(i)).
-                        getProcessStreamReceiver().getStreamId().equals(streamId + key)) {
+                        getProcessStreamReceiver().getStreamId().equals(streamId)) {
                     streamJunction.subscribe((streamRuntime.getSingleStreamRuntimes().get(i))
                             .getProcessStreamReceiver());
                 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/FindStoreQueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/FindStoreQueryRuntime.java
index 3985557b65..1782c6cc73 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/FindStoreQueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/FindStoreQueryRuntime.java
@@ -18,6 +18,7 @@
 package io.siddhi.core.query;
 
 import io.siddhi.core.aggregation.AggregationRuntime;
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.Event;
@@ -38,6 +39,7 @@
 public class FindStoreQueryRuntime extends StoreQueryRuntime {
 
     private CompiledCondition compiledCondition;
+    private SiddhiQueryContext siddhiQueryContext;
     private Table table;
     private Window window;
     private MetaStreamEvent.EventType eventType;
@@ -64,9 +66,10 @@ public FindStoreQueryRuntime(Window window, CompiledCondition compiledCondition,
     }
 
     public FindStoreQueryRuntime(AggregationRuntime aggregation, CompiledCondition compiledCondition, String queryName,
-                                 MetaStreamEvent metaStreamEvent) {
+                                 MetaStreamEvent metaStreamEvent, SiddhiQueryContext siddhiQueryContext) {
         this.aggregation = aggregation;
         this.compiledCondition = compiledCondition;
+        this.siddhiQueryContext = siddhiQueryContext;
         this.queryName = queryName;
         this.eventType = metaStreamEvent.getEventType();
         this.metaStreamEvent = metaStreamEvent;
@@ -89,7 +92,7 @@ public Event[] execute() {
                     stateEvent = new StateEvent(2, 0);
                     StreamEvent streamEvent = new StreamEvent(0, 2, 0);
                     stateEvent.addEvent(0, streamEvent);
-                    streamEvents = aggregation.find(stateEvent, compiledCondition);
+                    streamEvents = aggregation.find(stateEvent, compiledCondition, siddhiQueryContext);
                     break;
                 case DEFAULT:
                     break;
@@ -171,6 +174,5 @@ private Event[] executeSelector(StreamEvent streamEvents, MetaStreamEvent.EventT
         } else {
             return null;
         }
-
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/QueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/QueryRuntime.java
index 7b366d6a17..bd5cb979ec 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/QueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/QueryRuntime.java
@@ -22,14 +22,12 @@
 import io.siddhi.core.query.input.MultiProcessStreamReceiver;
 import io.siddhi.core.query.input.stream.StreamRuntime;
 import io.siddhi.core.query.input.stream.single.SingleStreamRuntime;
+import io.siddhi.core.query.input.stream.state.StateStreamRuntime;
 import io.siddhi.core.query.output.callback.OutputCallback;
 import io.siddhi.core.query.output.callback.QueryCallback;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.query.selector.QuerySelector;
-import io.siddhi.core.stream.StreamJunction;
-import io.siddhi.core.util.lock.LockWrapper;
-import io.siddhi.core.util.parser.OutputParser;
-import io.siddhi.core.util.parser.helper.QueryParserHelper;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 import io.siddhi.core.util.statistics.MemoryCalculable;
 import io.siddhi.query.api.definition.StreamDefinition;
 import io.siddhi.query.api.execution.query.Query;
@@ -38,19 +36,16 @@
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 
 import java.util.List;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Query Runtime represent holder object for a single Siddhi query and holds all runtime objects related to that query.
  */
-public class QueryRuntime implements MemoryCalculable {
+public class QueryRuntime implements MemoryCalculable, ExternalReferencedHolder {
 
     private StreamRuntime streamRuntime;
     private OutputRateLimiter outputRateLimiter;
     private Query query;
     private OutputCallback outputCallback;
-    private boolean synchronised;
     private SiddhiQueryContext siddhiQueryContext;
     private StreamDefinition outputStreamDefinition;
     private boolean toLocalStream;
@@ -59,13 +54,12 @@ public class QueryRuntime implements MemoryCalculable {
 
     public QueryRuntime(Query query, StreamRuntime streamRuntime, QuerySelector selector,
                         OutputRateLimiter outputRateLimiter, OutputCallback outputCallback,
-                        MetaComplexEvent metaComplexEvent, boolean synchronised,
+                        MetaComplexEvent metaComplexEvent,
                         SiddhiQueryContext siddhiQueryContext) {
         this.query = query;
         this.streamRuntime = streamRuntime;
         this.selector = selector;
         this.outputCallback = outputCallback;
-        this.synchronised = synchronised;
         this.siddhiQueryContext = siddhiQueryContext;
         outputRateLimiter.setOutputCallback(outputCallback);
         setOutputRateLimiter(outputRateLimiter);
@@ -118,40 +112,6 @@ public boolean isFromLocalStream() {
         return false;
     }
 
-    public QueryRuntime clone(String key, ConcurrentMap<String, StreamJunction> localStreamJunctionMap) {
-
-        LockWrapper lockWrapper = null;
-        if (synchronised) {
-            lockWrapper = new LockWrapper("");
-            lockWrapper.setLock(new ReentrantLock());
-        }
-        StreamRuntime clonedStreamRuntime = this.streamRuntime.clone(key);
-        QuerySelector clonedSelector = this.selector.clone(key);
-        OutputRateLimiter clonedOutputRateLimiter = outputRateLimiter.clone(key);
-        clonedOutputRateLimiter.init(lockWrapper, siddhiQueryContext);
-
-        QueryRuntime queryRuntime = new QueryRuntime(query, clonedStreamRuntime, clonedSelector,
-                clonedOutputRateLimiter, outputCallback, this.metaComplexEvent,
-                synchronised, siddhiQueryContext);
-        QueryParserHelper.initStreamRuntime(clonedStreamRuntime, metaComplexEvent, lockWrapper,
-                siddhiQueryContext.getName());
-
-        queryRuntime.setToLocalStream(toLocalStream);
-
-        if (!toLocalStream) {
-            queryRuntime.outputRateLimiter.setOutputCallback(outputCallback);
-            queryRuntime.outputCallback = this.outputCallback;
-        } else {
-            OutputCallback clonedQueryOutputCallback = OutputParser.constructOutputCallback(query.getOutputStream(),
-                    key, localStreamJunctionMap, outputStreamDefinition, siddhiQueryContext);
-            queryRuntime.outputRateLimiter.setOutputCallback(clonedQueryOutputCallback);
-            queryRuntime.outputCallback = clonedQueryOutputCallback;
-        }
-        queryRuntime.outputRateLimiter.start();
-        return queryRuntime;
-
-    }
-
     private void setOutputRateLimiter(OutputRateLimiter outputRateLimiter) {
         this.outputRateLimiter = outputRateLimiter;
         selector.setNextProcessor(outputRateLimiter);
@@ -196,4 +156,15 @@ public QuerySelector getSelector() {
         return selector;
     }
 
+    public void start() {
+        if (streamRuntime instanceof StateStreamRuntime) {
+            ((StateStreamRuntime) streamRuntime).start();
+        }
+        outputRateLimiter.start();
+    }
+
+    @Override
+    public void stop() {
+        outputRateLimiter.stop();
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
index 6cfd14b819..b95f61032f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
@@ -112,9 +112,9 @@ public void receive(ComplexEvent complexEvent) {
                 }
             } else {
                 List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-                try {
-                    multiProcessReturn.set(new ReturnEventHolder());
-                    synchronized (this) {
+                synchronized (this) {
+                    try {
+                        multiProcessReturn.set(new ReturnEventHolder());
                         stabilizeStates();
                         for (int anEventSequence : eventSequence) {
                             StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -128,9 +128,9 @@ public void receive(ComplexEvent complexEvent) {
                                 multiProcessReturn.set(new ReturnEventHolder());
                             }
                         }
+                    } finally {
+                        multiProcessReturn.set(null);
                     }
-                } finally {
-                    multiProcessReturn.set(null);
                 }
                 for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
                     outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
@@ -155,9 +155,10 @@ public void receive(Event event) {
             }
         } else {
             List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-            try {
-                multiProcessReturn.set(new ReturnEventHolder());
-                synchronized (this) {
+            synchronized (this) {
+                try {
+                    multiProcessReturn.set(new ReturnEventHolder());
+
                     stabilizeStates();
                     for (int anEventSequence : eventSequence) {
                         StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -171,9 +172,9 @@ public void receive(Event event) {
                             multiProcessReturn.set(new ReturnEventHolder());
                         }
                     }
+                } finally {
+                    multiProcessReturn.set(null);
                 }
-            } finally {
-                multiProcessReturn.set(null);
             }
             for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
                 outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
@@ -197,9 +198,9 @@ public void receive(Event[] events) {
                 }
             } else {
                 List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-                try {
-                    multiProcessReturn.set(new ReturnEventHolder());
-                    synchronized (this) {
+                synchronized (this) {
+                    try {
+                        multiProcessReturn.set(new ReturnEventHolder());
                         stabilizeStates();
                         for (int anEventSequence : eventSequence) {
                             StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -213,9 +214,9 @@ public void receive(Event[] events) {
                                 multiProcessReturn.set(new ReturnEventHolder());
                             }
                         }
+                    } finally {
+                        multiProcessReturn.set(null);
                     }
-                } finally {
-                    multiProcessReturn.set(null);
                 }
                 for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
                     outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
@@ -240,9 +241,10 @@ public void receive(List<Event> events) {
                 }
             } else {
                 List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-                try {
-                    multiProcessReturn.set(new ReturnEventHolder());
-                    synchronized (this) {
+                synchronized (this) {
+                    try {
+                        multiProcessReturn.set(new ReturnEventHolder());
+
                         stabilizeStates();
                         for (int anEventSequence : eventSequence) {
                             StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -256,9 +258,9 @@ public void receive(List<Event> events) {
                                 multiProcessReturn.set(new ReturnEventHolder());
                             }
                         }
+                    } finally {
+                        multiProcessReturn.set(null);
                     }
-                } finally {
-                    multiProcessReturn.set(null);
                 }
                 for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
                     outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
@@ -282,9 +284,9 @@ public void receive(long timestamp, Object[] data) {
             }
         } else {
             List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-            try {
-                multiProcessReturn.set(new ReturnEventHolder());
-                synchronized (this) {
+            synchronized (this) {
+                try {
+                    multiProcessReturn.set(new ReturnEventHolder());
                     stabilizeStates();
                     for (int anEventSequence : eventSequence) {
                         StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -298,9 +300,9 @@ public void receive(long timestamp, Object[] data) {
                             multiProcessReturn.set(new ReturnEventHolder());
                         }
                     }
+                } finally {
+                    multiProcessReturn.set(null);
                 }
-            } finally {
-                multiProcessReturn.set(null);
             }
             for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
                 outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/ProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/ProcessStreamReceiver.java
index 8e6aa472ae..078248aae0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/ProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/ProcessStreamReceiver.java
@@ -65,13 +65,6 @@ public String getStreamId() {
         return streamId;
     }
 
-    public ProcessStreamReceiver clone(String key) {
-        ProcessStreamReceiver processStreamReceiver = new ProcessStreamReceiver(
-                streamId + key, siddhiQueryContext);
-        processStreamReceiver.batchProcessingAllowed = this.batchProcessingAllowed;
-        return processStreamReceiver;
-    }
-
     public void setSiddhiDebugger(SiddhiDebugger siddhiDebugger) {
         this.siddhiDebugger = siddhiDebugger;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/SingleProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/SingleProcessStreamReceiver.java
index 66bf0d3f24..a62e22bcc8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/SingleProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/SingleProcessStreamReceiver.java
@@ -32,8 +32,6 @@
 public class SingleProcessStreamReceiver extends ProcessStreamReceiver {
 
     protected final String lockKey;
-    protected ComplexEventChunk<StreamEvent> currentStreamEventChunk = new ComplexEventChunk<StreamEvent>
-            (batchProcessingAllowed);
     private QuerySelector querySelector;
 
     public SingleProcessStreamReceiver(String streamId, String lockKey, SiddhiQueryContext siddhiQueryContext) {
@@ -46,21 +44,18 @@ public void setNext(Processor next) {
         this.querySelector = (QuerySelector) ((StreamPreStateProcessor) next).getThisLastProcessor().getNextProcessor();
     }
 
-    public SingleProcessStreamReceiver clone(String key) {
-        return new SingleProcessStreamReceiver(streamId + key, key,
-                siddhiQueryContext);
-    }
-
     protected void processAndClear(ComplexEventChunk<StreamEvent> streamEventChunk) {
         ComplexEventChunk<StateEvent> retEventChunk = new ComplexEventChunk<StateEvent>(false);
+        ComplexEventChunk<StreamEvent> currentStreamEventChunk = new ComplexEventChunk<StreamEvent>(
+                batchProcessingAllowed);
         synchronized (lockKey) {
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
                 streamEventChunk.remove();
                 stabilizeStates();
                 currentStreamEventChunk.add(streamEvent);
-                ComplexEventChunk<StateEvent> eventChunk = ((StreamPreStateProcessor) next).processAndReturn
-                        (currentStreamEventChunk);
+                ComplexEventChunk<StateEvent> eventChunk = ((StreamPreStateProcessor) next).
+                        processAndReturn(currentStreamEventChunk);
                 if (eventChunk.getFirst() != null) {
                     retEventChunk.add(eventChunk.getFirst());
                 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/StateMultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/StateMultiProcessStreamReceiver.java
index 472f7ae7ac..d2e1bbe6d0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/StateMultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/StateMultiProcessStreamReceiver.java
@@ -43,10 +43,6 @@ public void setNext(Processor next) {
                 .getNextProcessor();
     }
 
-    public StateMultiProcessStreamReceiver clone(String key) {
-        return new StateMultiProcessStreamReceiver(streamId + key, processCount, siddhiQueryContext);
-    }
-
     protected void processAndClear(int processIndex, StreamEvent streamEvent) {
         ComplexEventChunk<StateEvent> retEventChunk = new ComplexEventChunk<StateEvent>(batchProcessingAllowed);
         ComplexEventChunk<StreamEvent> currentStreamEventChunk = new ComplexEventChunk<StreamEvent>(streamEvent,
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/StreamRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/StreamRuntime.java
index 7438c3595c..aa29177636 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/StreamRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/StreamRuntime.java
@@ -31,8 +31,6 @@ public interface StreamRuntime {
 
     List<SingleStreamRuntime> getSingleStreamRuntimes();
 
-    StreamRuntime clone(String key);
-
     void setCommonProcessor(Processor commonProcessor);
 
     MetaComplexEvent getMetaComplexEvent();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinProcessor.java
index c32666c7bd..b8943f9fb0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinProcessor.java
@@ -162,28 +162,6 @@ public void setToLast(Processor processor) {
         }
     }
 
-    /**
-     * Clone a copy of processor.
-     *
-     * @param key partition key
-     * @return Cloned Processor
-     */
-    @Override
-    public Processor cloneProcessor(String key) {
-        JoinProcessor joinProcessor = new JoinProcessor(leftJoinProcessor, preJoinProcessor, outerJoinProcessor,
-                matchingStreamIndex);
-        joinProcessor.setTrigger(trigger);
-        if (trigger) {
-            joinProcessor.setCompiledCondition(compiledCondition.cloneCompilation(key));
-        }
-        return joinProcessor;
-    }
-
-    @Override
-    public void clean() {
-        //ignore
-    }
-
     public void setFindableProcessor(FindableProcessor findableProcessor) {
         this.findableProcessor = findableProcessor;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinStreamRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinStreamRuntime.java
index 92009eb7f7..3c78e9701b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinStreamRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinStreamRuntime.java
@@ -24,8 +24,6 @@
 import io.siddhi.core.query.input.stream.single.SingleStreamRuntime;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
-import io.siddhi.core.query.processor.stream.window.FindableProcessor;
-import io.siddhi.core.query.processor.stream.window.WindowProcessor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,13 +34,11 @@
 public class JoinStreamRuntime implements StreamRuntime {
 
     private List<SingleStreamRuntime> singleStreamRuntimeList = new ArrayList<SingleStreamRuntime>();
-    private SiddhiQueryContext siddhiQueryContext;
     private MetaStateEvent metaStateEvent;
     private ProcessingMode overallProcessingMode = ProcessingMode.BATCH;
 
     public JoinStreamRuntime(SiddhiQueryContext siddhiQueryContext, MetaStateEvent metaStateEvent) {
 
-        this.siddhiQueryContext = siddhiQueryContext;
         this.metaStateEvent = metaStateEvent;
     }
 
@@ -57,45 +53,6 @@ public List<SingleStreamRuntime> getSingleStreamRuntimes() {
         return singleStreamRuntimeList;
     }
 
-    @Override
-    public StreamRuntime clone(String key) {
-
-        JoinStreamRuntime joinStreamRuntime = new JoinStreamRuntime(siddhiQueryContext, metaStateEvent);
-        for (SingleStreamRuntime singleStreamRuntime : singleStreamRuntimeList) {
-            joinStreamRuntime.addRuntime((SingleStreamRuntime) singleStreamRuntime.clone(key));
-        }
-        SingleStreamRuntime leftSingleStreamRuntime = joinStreamRuntime.getSingleStreamRuntimes().get(0);
-        SingleStreamRuntime rightSingleStreamRuntime = joinStreamRuntime.getSingleStreamRuntimes().get(1);
-
-        Processor lastLeftProcessor = leftSingleStreamRuntime.getProcessorChain();
-
-        while (!(lastLeftProcessor instanceof JoinProcessor)) {
-            lastLeftProcessor = lastLeftProcessor.getNextProcessor();
-        }
-
-        JoinProcessor leftPreJoinProcessor = (JoinProcessor) lastLeftProcessor;
-        WindowProcessor leftWindowProcessor = (WindowProcessor) leftPreJoinProcessor.getNextProcessor();
-        JoinProcessor leftPostJoinProcessor = (JoinProcessor) leftWindowProcessor.getNextProcessor();
-
-        Processor lastRightProcessor = rightSingleStreamRuntime.getProcessorChain();
-
-        while (!(lastRightProcessor instanceof JoinProcessor)) {
-            lastRightProcessor = lastRightProcessor.getNextProcessor();
-        }
-
-        JoinProcessor rightPreJoinProcessor = (JoinProcessor) lastRightProcessor;
-        WindowProcessor rightWindowProcessor = (WindowProcessor) rightPreJoinProcessor.getNextProcessor();
-        JoinProcessor rightPostJoinProcessor = (JoinProcessor) rightWindowProcessor.getNextProcessor();
-
-        rightPostJoinProcessor.setFindableProcessor((FindableProcessor) leftWindowProcessor);
-        rightPreJoinProcessor.setFindableProcessor((FindableProcessor) leftWindowProcessor);
-
-        leftPreJoinProcessor.setFindableProcessor((FindableProcessor) rightWindowProcessor);
-        leftPostJoinProcessor.setFindableProcessor((FindableProcessor) rightWindowProcessor);
-
-        return joinStreamRuntime;
-    }
-
     @Override
     public void setCommonProcessor(Processor commonProcessor) {
         for (SingleStreamRuntime singleStreamRuntime : singleStreamRuntimeList) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveProcessor.java
index bb48d16b65..fdff448c1a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveProcessor.java
@@ -31,10 +31,8 @@ public class EntryValveProcessor implements Processor, Schedulable {
 
     private Processor next;
     private ThreadBarrier threadBarrier;
-    private SiddhiAppContext siddhiAppContext;
 
     public EntryValveProcessor(SiddhiAppContext siddhiAppContext) {
-        this.siddhiAppContext = siddhiAppContext;
         threadBarrier = siddhiAppContext.getThreadBarrier();
     }
 
@@ -85,20 +83,4 @@ public void setToLast(Processor processor) {
         }
     }
 
-    /**
-     * Clone a copy of processor
-     *
-     * @param key partition key
-     * @return cloned processor
-     */
-    @Override
-    public Processor cloneProcessor(String key) {
-        return new EntryValveProcessor(siddhiAppContext);
-    }
-
-    @Override
-    public void clean() {
-        //ignore
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/SingleStreamRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/SingleStreamRuntime.java
index e6456f6b79..c3e221f649 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/SingleStreamRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/SingleStreamRuntime.java
@@ -20,11 +20,8 @@
 import io.siddhi.core.event.MetaComplexEvent;
 import io.siddhi.core.query.input.ProcessStreamReceiver;
 import io.siddhi.core.query.input.stream.StreamRuntime;
-import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
-import io.siddhi.core.query.processor.SchedulingProcessor;
-import io.siddhi.core.query.selector.QuerySelector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,10 +57,6 @@ public ProcessStreamReceiver getProcessStreamReceiver() {
         return processStreamReceiver;
     }
 
-    public void setProcessStreamReceiver(ProcessStreamReceiver processStreamReceiver) {
-        this.processStreamReceiver = processStreamReceiver;
-    }
-
     @Override
     public List<SingleStreamRuntime> getSingleStreamRuntimes() {
         List<SingleStreamRuntime> list = new ArrayList<SingleStreamRuntime>(1);
@@ -72,39 +65,6 @@ public List<SingleStreamRuntime> getSingleStreamRuntimes() {
 
     }
 
-    @Override
-    public StreamRuntime clone(String key) {
-        ProcessStreamReceiver clonedProcessStreamReceiver = this.processStreamReceiver.clone(key);
-        EntryValveProcessor entryValveProcessor = null;
-        SchedulingProcessor schedulingProcessor;
-        Processor clonedProcessorChain = null;
-        if (processorChain != null) {
-            if (!(processorChain instanceof QuerySelector || processorChain instanceof OutputRateLimiter)) {
-                clonedProcessorChain = processorChain.cloneProcessor(key);
-                if (clonedProcessorChain instanceof EntryValveProcessor) {
-                    entryValveProcessor = (EntryValveProcessor) clonedProcessorChain;
-                }
-            }
-            Processor processor = processorChain.getNextProcessor();
-            while (processor != null) {
-                if (!(processor instanceof QuerySelector || processor instanceof OutputRateLimiter)) {
-                    Processor clonedProcessor = processor.cloneProcessor(key);
-                    clonedProcessorChain.setToLast(clonedProcessor);
-                    if (clonedProcessor instanceof EntryValveProcessor) {
-                        entryValveProcessor = (EntryValveProcessor) clonedProcessor;
-                    } else if (clonedProcessor instanceof SchedulingProcessor) {
-                        schedulingProcessor = (SchedulingProcessor) clonedProcessor;
-                        schedulingProcessor.setScheduler(((SchedulingProcessor) processor).getScheduler().clone(
-                                key, entryValveProcessor));
-                    }
-                }
-                processor = processor.getNextProcessor();
-            }
-        }
-        return new SingleStreamRuntime(clonedProcessStreamReceiver, clonedProcessorChain, overallProcessingMode,
-                metaComplexEvent);
-    }
-
     @Override
     public void setCommonProcessor(Processor commonProcessor) {
         if (processorChain == null) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPostStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPostStateProcessor.java
index 1676df7482..b88159ba39 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPostStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPostStateProcessor.java
@@ -48,10 +48,4 @@ protected void process(StateEvent stateEvent, ComplexEventChunk complexEventChun
         ((AbsentPreStateProcessor) thisStatePreProcessor).updateLastArrivalTime(streamEvent.getTimestamp());
     }
 
-    @Override
-    public PostStateProcessor cloneProcessor(String key) {
-        AbsentLogicalPostStateProcessor logicalPostStateProcessor = new AbsentLogicalPostStateProcessor(type);
-        cloneProperties(logicalPostStateProcessor);
-        return logicalPostStateProcessor;
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
index 2d3c80e15a..ae0e11795c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
@@ -18,17 +18,17 @@
 
 package io.siddhi.core.query.input.stream.state;
 
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.query.input.stream.single.EntryValveProcessor;
 import io.siddhi.core.util.Scheduler;
-import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.query.api.execution.query.input.state.LogicalStateElement;
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 import io.siddhi.query.api.expression.constant.TimeConstant;
 
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Logical not processor.
@@ -45,62 +45,52 @@ public class AbsentLogicalPreStateProcessor extends LogicalPreStateProcessor imp
      */
     private long waitingTime = -1;
 
-    /**
-     * The timestamp of the last event received by this processor.
-     */
-    private volatile long lastArrivalTime;
-
-    /**
-     * This flag turns to false after processing the first event if 'every' is not used.
-     */
-    private boolean active = true;
-
-    /**
-     * TimeConstant to be used by cloneProcessor method.
-     */
-    private TimeConstant waitingTimeConstant;
-
     public AbsentLogicalPreStateProcessor(LogicalStateElement.Type type, StateInputStream.Type stateType,
                                           TimeConstant waitingTime) {
         super(type, stateType);
         if (waitingTime != null) {
             this.waitingTime = waitingTime.value();
-            this.waitingTimeConstant = waitingTime;
         }
     }
 
+    public void init(SiddhiQueryContext siddhiQueryContext) {
+        this.siddhiQueryContext = siddhiQueryContext;
+        this.stateHolder = siddhiQueryContext.generateStateHolder(
+                this.getClass().getName(),
+                false, () -> new LogicalStreamPreState());
+    }
+
     @Override
     public void updateLastArrivalTime(long timestamp) {
-
+        StreamPreState state = stateHolder.getState();
         this.lock.lock();
         try {
-            this.lastArrivalTime = timestamp;
+            ((LogicalStreamPreState) state).lastArrivalTime = timestamp;
         } finally {
             this.lock.unlock();
+            stateHolder.returnState(state);
         }
     }
 
-    @Override
-    public void addState(StateEvent stateEvent) {
-
-        if (!this.active) {
+    protected void addState(StateEvent stateEvent, StreamPreState state) {
+        if (!((LogicalStreamPreState) state).active) {
             return;
         }
-        this.lock.lock();
+        lock.lock();
         try {
-            super.addState(stateEvent);
+            super.addState(stateEvent, state);
             if (!isStartState) {
                 if (waitingTime != -1) {
                     scheduler.notifyAt(stateEvent.getTimestamp() + waitingTime);
                     if (partnerStatePreProcessor instanceof AbsentLogicalPreStateProcessor) {
-                        ((AbsentLogicalPreStateProcessor) partnerStatePreProcessor).scheduler.notifyAt(stateEvent
-                                .getTimestamp() + ((AbsentLogicalPreStateProcessor) partnerStatePreProcessor)
-                                .waitingTime);
+                        ((AbsentLogicalPreStateProcessor) partnerStatePreProcessor).scheduler.notifyAt(
+                                stateEvent.getTimestamp() +
+                                        ((AbsentLogicalPreStateProcessor) partnerStatePreProcessor).waitingTime);
                     }
                 }
             }
         } finally {
-            this.lock.unlock();
+            lock.unlock();
         }
     }
 
@@ -114,98 +104,100 @@ public void addEveryState(StateEvent stateEvent) {
         }
         clonedEvent.setEvent(stateId, null);
         clonedEvent.setEvent(partnerStatePreProcessor.stateId, null);
-        // Start state takes events from newAndEveryStateEventList
-        newAndEveryStateEventList.add(clonedEvent);
-        partnerStatePreProcessor.newAndEveryStateEventList.add(clonedEvent);
+        StreamPreState state = stateHolder.getState();
+        try {
+            // Start state takes events from newAndEveryStateEventList
+            state.getNewAndEveryStateEventList().add(clonedEvent);
+            partnerStatePreProcessor.addEventToNewAndEveryStateEventList(clonedEvent);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
 
-        if (!this.active) {
-            return;
-        }
-        boolean notProcessed = true;
-        ComplexEventChunk<StateEvent> retEventChunk = new ComplexEventChunk<>(false);
-        this.lock.lock();
+        StreamPreState state = stateHolder.getState();
         try {
-            long currentTime = complexEventChunk.getFirst().getTimestamp();
-            if (currentTime >= this.lastArrivalTime + waitingTime) {
-
-
-                Iterator<StateEvent> iterator;
-                if (isStartState && stateType == StateInputStream.Type.SEQUENCE && newAndEveryStateEventList.isEmpty()
-                        && pendingStateEventList.isEmpty()) {
-
-                    StateEvent stateEvent = stateEventPool.borrowEvent();
-                    addState(stateEvent);
-                } else if (stateType == StateInputStream.Type.SEQUENCE && !newAndEveryStateEventList.isEmpty()) {
-                    this.resetState();
-                }
-
-                this.updateState();
-                iterator = pendingStateEventList.iterator();
-
-                while (iterator.hasNext()) {
-                    StateEvent stateEvent = iterator.next();
-
-                    // Remove expired events based on within
-                    if (isExpired(stateEvent, currentTime)) {
-                        iterator.remove();
-                        if (withinEveryPreStateProcessor != null) {
-                            withinEveryPreStateProcessor.addEveryState(stateEvent);
-                            withinEveryPreStateProcessor.updateState();
-                        }
-                        continue;
+            if (!((LogicalStreamPreState) state).active) {
+                return;
+            }
+            boolean notProcessed = true;
+            ComplexEventChunk<StateEvent> retEventChunk = new ComplexEventChunk<>(false);
+            this.lock.lock();
+            try {
+                long currentTime = complexEventChunk.getFirst().getTimestamp();
+                if (currentTime >= ((LogicalStreamPreState) state).lastArrivalTime + waitingTime) {
+                    Iterator<StateEvent> iterator;
+                    if (isStartState && stateType == StateInputStream.Type.SEQUENCE &&
+                            state.getNewAndEveryStateEventList().isEmpty() &&
+                            state.getPendingStateEventList().isEmpty()) {
+
+                        StateEvent stateEvent = stateEventPool.borrowEvent();
+                        addState(stateEvent);
+                    } else if (stateType == StateInputStream.Type.SEQUENCE &&
+                            !state.getNewAndEveryStateEventList().isEmpty()) {
+                        this.resetState();
                     }
-
-                    // Collect the events that came before the waiting time
-                    if (waitingTimePassed(currentTime, stateEvent)) {
-
-                        iterator.remove();
-
-                        if (logicalType == LogicalStateElement.Type.OR && stateEvent.getStreamEvent
-                                (partnerStatePreProcessor.getStateId()) == null) {
-                            // OR Partner not received
-                            stateEvent.addEvent(stateId, streamEventPool.borrowEvent());
-                            retEventChunk.add(stateEvent);
-                        } else if (logicalType == LogicalStateElement.Type.AND && stateEvent.getStreamEvent
-                                (partnerStatePreProcessor.getStateId()) != null) {
-                            // AND partner received but didn't send out
-                            retEventChunk.add(stateEvent);
-                        } else if (logicalType == LogicalStateElement.Type.AND && stateEvent.getStreamEvent
-                                (partnerStatePreProcessor.getStateId()) == null) {
-                            // AND partner didn't receive
-                            // Let the partner to process or not
-                            stateEvent.addEvent(stateId, streamEventPool.borrowEvent());
+                    this.updateState();
+                    iterator = state.getPendingStateEventList().iterator();
+                    while (iterator.hasNext()) {
+                        StateEvent stateEvent = iterator.next();
+                        // Remove expired events based on within
+                        if (isExpired(stateEvent, currentTime)) {
+                            iterator.remove();
+                            if (withinEveryPreStateProcessor != null) {
+                                withinEveryPreStateProcessor.addEveryState(stateEvent);
+                                withinEveryPreStateProcessor.updateState();
+                            }
+                            continue;
+                        }
+                        // Collect the events that came before the waiting time
+                        if (waitingTimePassed(currentTime, stateEvent)) {
+                            iterator.remove();
+                            if (logicalType == LogicalStateElement.Type.OR && stateEvent.getStreamEvent
+                                    (partnerStatePreProcessor.getStateId()) == null) {
+                                // OR Partner not received
+                                stateEvent.addEvent(stateId, streamEventPool.borrowEvent());
+                                retEventChunk.add(stateEvent);
+                            } else if (logicalType == LogicalStateElement.Type.AND && stateEvent.getStreamEvent
+                                    (partnerStatePreProcessor.getStateId()) != null) {
+                                // AND partner received but didn't send out
+                                retEventChunk.add(stateEvent);
+                            } else if (logicalType == LogicalStateElement.Type.AND && stateEvent.getStreamEvent
+                                    (partnerStatePreProcessor.getStateId()) == null) {
+                                // AND partner didn't receive
+                                // Let the partner to process or not
+                                stateEvent.addEvent(stateId, streamEventPool.borrowEvent());
+                            }
                         }
                     }
+                    retEventChunk.reset();
+                    notProcessed = retEventChunk.getFirst() == null;
+                    while (retEventChunk.hasNext()) {
+                        StateEvent stateEvent = retEventChunk.next();
+                        retEventChunk.remove();
+                        sendEvent(stateEvent, state);
+                    }
+                    ((LogicalStreamPreState) state).lastArrivalTime = 0;
                 }
+            } finally {
+                this.lock.unlock();
+            }
 
-                retEventChunk.reset();
-                notProcessed = retEventChunk.getFirst() == null;
-                while (retEventChunk.hasNext()) {
-                    StateEvent stateEvent = retEventChunk.next();
-                    retEventChunk.remove();
-                    sendEvent(stateEvent);
+            if (thisStatePostProcessor.nextEveryStatePreProcessor != null || (notProcessed && isStartState)) {
+                // If every or (notProcessed and startState), schedule again
+                long nextBreak;
+                if (((LogicalStreamPreState) state).lastArrivalTime == 0) {
+                    nextBreak = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime() +
+                            waitingTime;
+                } else {
+                    nextBreak = ((LogicalStreamPreState) state).lastArrivalTime + waitingTime;
                 }
-
-                this.lastArrivalTime = 0;
+                this.scheduler.notifyAt(nextBreak);
             }
         } finally {
-            this.lock.unlock();
-        }
-
-        if (thisStatePostProcessor.nextEveryStatePreProcessor != null || (notProcessed && isStartState)) {
-            // If every or (notProcessed and startState), schedule again
-            long nextBreak;
-            if (lastArrivalTime == 0) {
-                nextBreak = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime() +
-                        waitingTime;
-            } else {
-                nextBreak = lastArrivalTime + waitingTime;
-            }
-            this.scheduler.notifyAt(nextBreak);
+            stateHolder.returnState(state);
         }
     }
 
@@ -219,7 +211,7 @@ private boolean waitingTimePassed(long currentTime, StateEvent event) {
         }
     }
 
-    private void sendEvent(StateEvent stateEvent) {
+    private void sendEvent(StateEvent stateEvent, StreamPreState state) {
         if (thisStatePostProcessor.nextProcessor != null) {
             thisStatePostProcessor.nextProcessor.process(new ComplexEventChunk<>(stateEvent,
                     stateEvent, false));
@@ -230,10 +222,10 @@ private void sendEvent(StateEvent stateEvent) {
         if (thisStatePostProcessor.nextEveryStatePreProcessor != null) {
             thisStatePostProcessor.nextEveryStatePreProcessor.addEveryState(stateEvent);
         } else if (isStartState) {
-            this.active = false;
+            ((LogicalStreamPreState) state).active = false;
             if (logicalType == LogicalStateElement.Type.OR &&
                     partnerStatePreProcessor instanceof AbsentLogicalPreStateProcessor) {
-                ((AbsentLogicalPreStateProcessor) partnerStatePreProcessor).active = false;
+                ((AbsentLogicalPreStateProcessor) partnerStatePreProcessor).setActive(false);
             }
         }
         if (thisStatePostProcessor.callbackPreStateProcessor != null) {
@@ -241,67 +233,81 @@ private void sendEvent(StateEvent stateEvent) {
         }
     }
 
+    private void setActive(boolean active) {
+        StreamPreState state = stateHolder.getState();
+        try {
+            ((LogicalStreamPreState) state).active = active;
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
     @Override
     public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexEventChunk) {
 
         ComplexEventChunk<StateEvent> returnEventChunk = new ComplexEventChunk<>(false);
-
-        if (!this.active) {
-            return returnEventChunk;
-        }
-        complexEventChunk.reset();
-        StreamEvent streamEvent = (StreamEvent) complexEventChunk.next(); //Sure only one will be sent
-
-        this.lock.lock();
+        StreamPreState state = stateHolder.getState();
         try {
-            for (Iterator<StateEvent> iterator = pendingStateEventList.iterator(); iterator.hasNext(); ) {
-                StateEvent stateEvent = iterator.next();
-                if (isExpired(stateEvent, streamEvent.getTimestamp())) {
-                    if (withinEveryPreStateProcessor != null) {
-                        withinEveryPreStateProcessor.addEveryState(stateEvent);
-                        withinEveryPreStateProcessor.updateState();
+
+            if (!((LogicalStreamPreState) state).active) {
+                return returnEventChunk;
+            }
+            complexEventChunk.reset();
+            StreamEvent streamEvent = (StreamEvent) complexEventChunk.next(); //Sure only one will be sent
+            this.lock.lock();
+            try {
+                for (Iterator<StateEvent> iterator = state.getPendingStateEventList().iterator();
+                     iterator.hasNext(); ) {
+                    StateEvent stateEvent = iterator.next();
+                    if (isExpired(stateEvent, streamEvent.getTimestamp())) {
+                        if (withinEveryPreStateProcessor != null) {
+                            withinEveryPreStateProcessor.addEveryState(stateEvent);
+                            withinEveryPreStateProcessor.updateState();
+                        }
+                        iterator.remove();
+                        continue;
                     }
-                    iterator.remove();
-                    continue;
-                }
-                if (logicalType == LogicalStateElement.Type.OR &&
-                        stateEvent.getStreamEvent(partnerStatePreProcessor.getStateId()) != null) {
-                    iterator.remove();
-                    continue;
-                }
-                StreamEvent currentStreamEvent = stateEvent.getStreamEvent(stateId);
-                stateEvent.setEvent(stateId, streamEventCloner.copyStreamEvent(streamEvent));
-                process(stateEvent);
-                if (waitingTime != -1 || (stateType == StateInputStream.Type.SEQUENCE &&
-                        logicalType == LogicalStateElement.Type.AND && thisStatePostProcessor
-                        .nextEveryStatePreProcessor != null)) {
-                    // Reset to the original state after processing
-                    stateEvent.setEvent(stateId, currentStreamEvent);
-                }
-                if (this.thisLastProcessor.isEventReturned()) {
-                    this.thisLastProcessor.clearProcessedEvent();
-                    // The event has passed the filter condition. So remove from being an absent candidate.
-                    iterator.remove();
-                    if (stateType == StateInputStream.Type.SEQUENCE) {
-                        partnerStatePreProcessor.pendingStateEventList.remove(stateEvent);
+                    if (logicalType == LogicalStateElement.Type.OR &&
+                            stateEvent.getStreamEvent(partnerStatePreProcessor.getStateId()) != null) {
+                        iterator.remove();
+                        continue;
                     }
-                }
-                if (!stateChanged) {
-                    switch (stateType) {
-                        case PATTERN:
-                            stateEvent.setEvent(stateId, currentStreamEvent);
-                            break;
-                        case SEQUENCE:
-                            stateEvent.setEvent(stateId, currentStreamEvent);
-                            iterator.remove();
-                            break;
+                    StreamEvent currentStreamEvent = stateEvent.getStreamEvent(stateId);
+                    stateEvent.setEvent(stateId, streamEventCloner.copyStreamEvent(streamEvent));
+                    process(stateEvent);
+                    if (waitingTime != -1 || (stateType == StateInputStream.Type.SEQUENCE &&
+                            logicalType == LogicalStateElement.Type.AND && thisStatePostProcessor
+                            .nextEveryStatePreProcessor != null)) {
+                        // Reset to the original state after processing
+                        stateEvent.setEvent(stateId, currentStreamEvent);
+                    }
+                    if (this.thisLastProcessor.isEventReturned()) {
+                        this.thisLastProcessor.clearProcessedEvent();
+                        // The event has passed the filter condition. So remove from being an absent candidate.
+                        iterator.remove();
+                        if (stateType == StateInputStream.Type.SEQUENCE) {
+                            partnerStatePreProcessor.getPendingStateEventList().remove(stateEvent);
+                        }
+                    }
+                    if (!state.isStateChanged()) {
+                        switch (stateType) {
+                            case PATTERN:
+                                stateEvent.setEvent(stateId, currentStreamEvent);
+                                break;
+                            case SEQUENCE:
+                                stateEvent.setEvent(stateId, currentStreamEvent);
+                                iterator.remove();
+                                break;
+                        }
                     }
                 }
+            } finally {
+                this.lock.unlock();
             }
+            return returnEventChunk;
         } finally {
-            this.lock.unlock();
+            stateHolder.returnState(state);
         }
-        return returnEventChunk;
     }
 
     @Override
@@ -314,33 +320,25 @@ public void setScheduler(Scheduler scheduler) {
         this.scheduler = scheduler;
     }
 
-    @Override
-    public PreStateProcessor cloneProcessor(String key) {
-        AbsentLogicalPreStateProcessor logicalPreStateProcessor = new AbsentLogicalPreStateProcessor(logicalType,
-                stateType, waitingTimeConstant);
-        cloneProperties(logicalPreStateProcessor, key);
-        logicalPreStateProcessor.init(siddhiQueryContext);
-
-        // Set the scheduler
-        siddhiQueryContext.getSiddhiAppContext().addEternalReferencedHolder(logicalPreStateProcessor);
-        EntryValveProcessor entryValveProcessor = new EntryValveProcessor(siddhiQueryContext.getSiddhiAppContext());
-        entryValveProcessor.setToLast(logicalPreStateProcessor);
-        Scheduler scheduler = SchedulerParser.parse(entryValveProcessor, siddhiQueryContext.getSiddhiAppContext());
-        logicalPreStateProcessor.setScheduler(scheduler);
-
-        return logicalPreStateProcessor;
-    }
-
     @Override
     public void start() {
-        if (isStartState && waitingTime != -1 && active) {
-            this.lock.lock();
-            try {
-                this.scheduler.notifyAt(this.siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator()
-                        .currentTime() + waitingTime);
-            } finally {
-                this.lock.unlock();
+        StreamPreState state = stateHolder.getState();
+        try {
+            if (!state.isStarted()) {
+                state.started();
+                if (isStartState && waitingTime != -1 && ((LogicalStreamPreState) state).active) {
+                    this.lock.lock();
+                    try {
+                        this.scheduler.notifyAt(
+                                this.siddhiQueryContext.getSiddhiAppContext().
+                                        getTimestampGenerator().currentTime() + waitingTime);
+                    } finally {
+                        this.lock.unlock();
+                    }
+                }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
     }
 
@@ -351,34 +349,72 @@ public void stop() {
     }
 
     public boolean partnerCanProceed(StateEvent stateEvent) {
-
-        boolean process;
-        if (stateType == StateInputStream.Type.SEQUENCE && thisStatePostProcessor.nextEveryStatePreProcessor == null
-                && this.lastArrivalTime > 0) {
-            process = false;
-        } else {
-            if (this.waitingTime == -1) {
-                // for time is not defined and event is not received by absent processor
-                if (thisStatePostProcessor.nextEveryStatePreProcessor == null) {
-                    process = stateEvent.getStreamEvent(this.stateId) == null;
-                } else {
-                    // Every
-                    if (this.lastArrivalTime > 0) {
-                        process = false;
-                        this.lastArrivalTime = 0;
-                        this.init();
+        StreamPreState state = stateHolder.getState();
+        try {
+            boolean process;
+            if (stateType == StateInputStream.Type.SEQUENCE &&
+                    thisStatePostProcessor.nextEveryStatePreProcessor == null &&
+                    ((LogicalStreamPreState) state).lastArrivalTime > 0) {
+                process = false;
+            } else {
+                if (this.waitingTime == -1) {
+                    // for time is not defined and event is not received by absent processor
+                    if (thisStatePostProcessor.nextEveryStatePreProcessor == null) {
+                        process = stateEvent.getStreamEvent(this.stateId) == null;
                     } else {
-                        process = true;
+                        // Every
+                        if (((LogicalStreamPreState) state).lastArrivalTime > 0) {
+                            process = false;
+                            ((LogicalStreamPreState) state).lastArrivalTime = 0;
+                            init();
+                        } else {
+                            process = true;
+                        }
                     }
+                } else if (stateEvent.getStreamEvent(this.stateId) != null) {
+                    // for time is defined
+                    process = true;
+                } else {
+                    process = false;
                 }
-            } else if (stateEvent.getStreamEvent(this.stateId) != null) {
-                // for time is defined
-                process = true;
-            } else {
-                process = false;
             }
+
+            return process;
+        } finally {
+            stateHolder.returnState(state);
         }
+    }
+
+    class LogicalStreamPreState extends StreamPreState {
 
-        return process;
+        /**
+         * The timestamp of the last event received by this processor.
+         */
+        private volatile long lastArrivalTime;
+
+        /**
+         * This flag turns to false after processing the first event if 'every' is not used.
+         */
+        private boolean active = true;
+
+        @Override
+        public boolean canDestroy() {
+            return super.canDestroy() && lastArrivalTime == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> snapshot = super.snapshot();
+            snapshot.put("IsActive", active);
+            snapshot.put("LastArrivalTime", lastArrivalTime);
+            return snapshot;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            super.restore(state);
+            active = (Boolean) state.get("IsActive");
+            lastArrivalTime = (Long) state.get("LastArrivalTime");
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentPreStateProcessor.java
index c8a71134f8..40e5eca75c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentPreStateProcessor.java
@@ -19,12 +19,12 @@
 package io.siddhi.core.query.input.stream.state;
 
 import io.siddhi.core.query.processor.SchedulingProcessor;
-import io.siddhi.core.util.extension.holder.EternalReferencedHolder;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 
 /**
  * PreStateProcessor of events not received by Siddhi.
  */
-public interface AbsentPreStateProcessor extends SchedulingProcessor, EternalReferencedHolder {
+public interface AbsentPreStateProcessor extends SchedulingProcessor, ExternalReferencedHolder {
 
     /**
      * Update the timestamp of the event arrived to this processor and met the filter conditions.
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPostStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPostStateProcessor.java
index 0ba4c2880b..43e0ec4c93 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPostStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPostStateProcessor.java
@@ -55,10 +55,4 @@ protected void process(StateEvent stateEvent, ComplexEventChunk complexEventChun
         ((AbsentPreStateProcessor) thisStatePreProcessor).updateLastArrivalTime(streamEvent.getTimestamp());
     }
 
-    @Override
-    public PostStateProcessor cloneProcessor(String key) {
-        AbsentStreamPostStateProcessor streamPostStateProcessor = new AbsentStreamPostStateProcessor();
-        cloneProperties(streamPostStateProcessor);
-        return streamPostStateProcessor;
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
index fdae11708a..5c8a6d68c1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
@@ -18,14 +18,14 @@
 
 package io.siddhi.core.query.input.stream.state;
 
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
-import io.siddhi.core.query.input.stream.single.EntryValveProcessor;
 import io.siddhi.core.util.Scheduler;
-import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Pre processor of not operator.
@@ -42,17 +42,6 @@ public class AbsentStreamPreStateProcessor extends StreamPreStateProcessor imple
      */
     private long waitingTime = -1;
 
-    /**
-     * The timestamp of the last event scheduled by this processor.
-     */
-    private long lastScheduledTime;
-
-    /**
-     * This flag turns to false after processing the first event if 'every' is not used.
-     * This is used to process only one pattern if 'every' is not used.
-     */
-    private boolean active = true;
-
     /**
      * Construct an AbsentStreamPreStateProcessor object.
      *
@@ -66,34 +55,45 @@ public AbsentStreamPreStateProcessor(StateInputStream.Type stateType,
         this.waitingTime = waitingTime;
     }
 
+    public void init(SiddhiQueryContext siddhiQueryContext) {
+        this.siddhiQueryContext = siddhiQueryContext;
+        this.stateHolder = siddhiQueryContext.generateStateHolder(
+                this.getClass().getName(),
+                false, () -> new LogicalStreamPreState());
+    }
+
     @Override
     public void updateLastArrivalTime(long timestamp) {
-        synchronized (this) {
-            this.lastScheduledTime = timestamp + waitingTime;
-            scheduler.notifyAt(lastScheduledTime);
+        LogicalStreamPreState state = (LogicalStreamPreState) stateHolder.getState();
+        this.lock.lock();
+        try {
+            state.lastScheduledTime = timestamp + waitingTime;
+            scheduler.notifyAt(state.lastScheduledTime);
+        } finally {
+            this.lock.unlock();
+            stateHolder.returnState(state);
         }
     }
 
-    @Override
-    public void addState(StateEvent stateEvent) {
-
-        if (!this.active) {
+    protected void addState(StateEvent stateEvent, StreamPreState preState) {
+        LogicalStreamPreState state = (LogicalStreamPreState) preState;
+        if (!state.active) {
             // 'every' keyword is not used and already a pattern is processed
             return;
         }
         lock.lock();
         try {
             if (stateType == StateInputStream.Type.SEQUENCE) {
-                newAndEveryStateEventList.clear();
-                newAndEveryStateEventList.add(stateEvent);
+                state.getNewAndEveryStateEventList().clear();
+                state.getNewAndEveryStateEventList().add(stateEvent);
             } else {
-                newAndEveryStateEventList.add(stateEvent);
+                state.getNewAndEveryStateEventList().add(stateEvent);
             }
             // If this is the first processor, nothing to receive from previous patterns
             if (!isStartState) {
                 // Start the scheduler
-                lastScheduledTime = stateEvent.getTimestamp() + waitingTime;
-                scheduler.notifyAt(lastScheduledTime);
+                state.lastScheduledTime = stateEvent.getTimestamp() + waitingTime;
+                scheduler.notifyAt(state.lastScheduledTime);
             }
         } finally {
             lock.unlock();
@@ -102,30 +102,33 @@ public void addState(StateEvent stateEvent) {
 
     @Override
     public void addEveryState(StateEvent stateEvent) {
+        LogicalStreamPreState state = (LogicalStreamPreState) stateHolder.getState();
         lock.lock();
         try {
             StateEvent clonedEvent = stateEventCloner.copyStateEvent(stateEvent);
-            newAndEveryStateEventList.add(clonedEvent);
+            state.getNewAndEveryStateEventList().add(clonedEvent);
             // Start the scheduler
-            lastScheduledTime = stateEvent.getTimestamp() + waitingTime;
-            scheduler.notifyAt(lastScheduledTime);
+            state.lastScheduledTime = stateEvent.getTimestamp() + waitingTime;
+            scheduler.notifyAt(state.lastScheduledTime);
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
     }
 
     @Override
     public void resetState() {
 
+        LogicalStreamPreState state = (LogicalStreamPreState) stateHolder.getState();
         lock.lock();
         try {
             // Clear the events added by the previous processor
-            pendingStateEventList.clear();
+            state.getPendingStateEventList().clear();
             if (isStartState) {
                 if (stateType == StateInputStream.Type.SEQUENCE &&
                         thisStatePostProcessor.nextEveryStatePreProcessor == null &&
                         !((StreamPreStateProcessor) thisStatePostProcessor.nextStatePreProcessor)
-                                .pendingStateEventList.isEmpty()) {
+                                .getPendingStateEventList().isEmpty()) {
                     // Sequence without 'every' keyword and the next processor has pending events to be processed
                     return;
                 }
@@ -134,82 +137,90 @@ public void resetState() {
             }
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
-        if (!this.active) {
-            // Every keyword is not used and already a pattern is processed
-            return;
-        }
-        boolean notProcessed = true;
-        long currentTime = complexEventChunk.getFirst().getTimestamp();
-        ComplexEventChunk<StateEvent> retEventChunk = new ComplexEventChunk<>(false);
-        lock.lock();
+        LogicalStreamPreState state = (LogicalStreamPreState) stateHolder.getState();
         try {
-            // If the process method is called, it is guaranteed that the waitingTime is passed
-            boolean initialize = isStartState && newAndEveryStateEventList.isEmpty()
-                    && pendingStateEventList.isEmpty();
-            if (initialize && stateType == StateInputStream.Type.SEQUENCE &&
-                    thisStatePostProcessor.nextEveryStatePreProcessor == null && this.lastScheduledTime > 0) {
-                // Sequence with no every but an event arrived
-                initialize = false;
+            if (!state.active) {
+                // Every keyword is not used and already a pattern is processed
+                return;
             }
+            boolean notProcessed = true;
+            long currentTime = complexEventChunk.getFirst().getTimestamp();
+            ComplexEventChunk<StateEvent> retEventChunk = new ComplexEventChunk<>(false);
+            lock.lock();
+            try {
+                // If the process method is called, it is guaranteed that the waitingTime is passed
+                boolean initialize = isStartState && state.getNewAndEveryStateEventList().isEmpty()
+                        && state.getPendingStateEventList().isEmpty();
+                if (initialize && stateType == StateInputStream.Type.SEQUENCE &&
+                        thisStatePostProcessor.nextEveryStatePreProcessor == null && state.lastScheduledTime > 0) {
+                    // Sequence with no every but an event arrived
+                    initialize = false;
+                }
 
-            if (initialize) {
-                // This is the first processor and no events received so far
-                StateEvent stateEvent = stateEventPool.borrowEvent();
-                addState(stateEvent);
-            } else if (stateType == StateInputStream.Type.SEQUENCE && !newAndEveryStateEventList.isEmpty()) {
-                this.resetState();
-            }
-            this.updateState();
-
-            Iterator<StateEvent> iterator = pendingStateEventList.iterator();
-            while (iterator.hasNext()) {
-                StateEvent event = iterator.next();
-                // Remove expired events based on within
-                if (isExpired(event, currentTime)) {
-                    iterator.remove();
-                    if (withinEveryPreStateProcessor != null
-                            && thisStatePostProcessor.nextEveryStatePreProcessor != this) {
-                        thisStatePostProcessor.nextEveryStatePreProcessor.addEveryState(event);
+                if (initialize) {
+                    // This is the first processor and no events received so far
+                    StateEvent stateEvent = stateEventPool.borrowEvent();
+                    addState(stateEvent);
+                } else if (stateType == StateInputStream.Type.SEQUENCE &&
+                        !state.getNewAndEveryStateEventList().isEmpty()) {
+                    this.resetState();
+                }
+                this.updateState();
+
+                Iterator<StateEvent> iterator = state.getPendingStateEventList().iterator();
+                while (iterator.hasNext()) {
+                    StateEvent event = iterator.next();
+                    // Remove expired events based on within
+                    if (isExpired(event, currentTime)) {
+                        iterator.remove();
+                        if (withinEveryPreStateProcessor != null
+                                && thisStatePostProcessor.nextEveryStatePreProcessor != this) {
+                            thisStatePostProcessor.nextEveryStatePreProcessor.addEveryState(event);
+                        }
+                        continue;
+                    }
+                    // Collect the events that came before the waiting time
+                    if (event.getTimestamp() == -1 && currentTime >= state.lastScheduledTime ||
+                            event.getTimestamp() != -1 && currentTime >= event.getTimestamp() + waitingTime) {
+                        iterator.remove();
+                        event.setTimestamp(currentTime);
+                        retEventChunk.add(event);
                     }
-                    continue;
                 }
-                // Collect the events that came before the waiting time
-                if (event.getTimestamp() == -1 && currentTime >= lastScheduledTime ||
-                        event.getTimestamp() != -1 && currentTime >= event.getTimestamp() + waitingTime) {
-                    iterator.remove();
-                    event.setTimestamp(currentTime);
-                    retEventChunk.add(event);
+                if (withinEveryPreStateProcessor != null) {
+                    withinEveryPreStateProcessor.updateState();
                 }
+            } finally {
+                lock.unlock();
             }
-            if (withinEveryPreStateProcessor != null) {
-                withinEveryPreStateProcessor.updateState();
+
+            notProcessed = retEventChunk.getFirst() == null;
+            while (retEventChunk.hasNext()) {
+                StateEvent stateEvent = retEventChunk.next();
+                retEventChunk.remove();
+                sendEvent(stateEvent, state);
             }
-        } finally {
-            lock.unlock();
-        }
-        notProcessed = retEventChunk.getFirst() == null;
-        while (retEventChunk.hasNext()) {
-            StateEvent stateEvent = retEventChunk.next();
-            retEventChunk.remove();
-            sendEvent(stateEvent);
-        }
 
-        long actualCurrentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
-        if (actualCurrentTime > waitingTime + currentTime) {
-            lastScheduledTime = actualCurrentTime + waitingTime;
-        }
-        if (notProcessed && lastScheduledTime < currentTime) {
-            lastScheduledTime = currentTime + waitingTime;
-            this.scheduler.notifyAt(lastScheduledTime);
+            long actualCurrentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
+            if (actualCurrentTime > waitingTime + currentTime) {
+                state.lastScheduledTime = actualCurrentTime + waitingTime;
+            }
+            if (notProcessed && state.lastScheduledTime < currentTime) {
+                state.lastScheduledTime = currentTime + waitingTime;
+                this.scheduler.notifyAt(state.lastScheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
         }
     }
 
-    private void sendEvent(StateEvent stateEvent) {
+    private void sendEvent(StateEvent stateEvent, LogicalStreamPreState state) {
         if (thisStatePostProcessor.nextProcessor != null) {
             thisStatePostProcessor.nextProcessor.process(new ComplexEventChunk<>(stateEvent, stateEvent, false));
         }
@@ -219,7 +230,7 @@ private void sendEvent(StateEvent stateEvent) {
         if (thisStatePostProcessor.nextEveryStatePreProcessor != null) {
             thisStatePostProcessor.nextEveryStatePreProcessor.addEveryState(stateEvent);
         } else if (isStartState) {
-            this.active = false;
+            state.active = false;
         }
 
         if (thisStatePostProcessor.callbackPreStateProcessor != null) {
@@ -229,18 +240,22 @@ private void sendEvent(StateEvent stateEvent) {
 
     @Override
     public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexEventChunk) {
+        LogicalStreamPreState state = (LogicalStreamPreState) stateHolder.getState();
+        try {
+            if (!state.active) {
+                return new ComplexEventChunk<>(false);
+            }
+            ComplexEventChunk<StateEvent> event = super.processAndReturn(complexEventChunk);
 
-        if (!this.active) {
-            return new ComplexEventChunk<>(false);
-        }
-        ComplexEventChunk<StateEvent> event = super.processAndReturn(complexEventChunk);
-
-        StateEvent firstEvent = event.getFirst();
-        if (firstEvent != null) {
-            event = new ComplexEventChunk<>(false);
+            StateEvent firstEvent = event.getFirst();
+            if (firstEvent != null) {
+                event = new ComplexEventChunk<>(false);
+            }
+            // Always return an empty event
+            return event;
+        } finally {
+            stateHolder.returnState(state);
         }
-        // Always return an empty event
-        return event;
     }
 
     protected boolean removeOnNoStateChange(StateInputStream.Type stateType) {
@@ -257,32 +272,25 @@ public void setScheduler(Scheduler scheduler) {
         this.scheduler = scheduler;
     }
 
-    @Override
-    public PreStateProcessor cloneProcessor(String key) {
-        AbsentStreamPreStateProcessor streamPreStateProcessor = new AbsentStreamPreStateProcessor(stateType,
-                waitingTime);
-        cloneProperties(streamPreStateProcessor, key);
-        streamPreStateProcessor.init(siddhiQueryContext);
-
-        // Set the scheduler
-        siddhiQueryContext.getSiddhiAppContext().addEternalReferencedHolder(streamPreStateProcessor);
-        EntryValveProcessor entryValveProcessor = new EntryValveProcessor(siddhiQueryContext.getSiddhiAppContext());
-        entryValveProcessor.setToLast(streamPreStateProcessor);
-        Scheduler scheduler = SchedulerParser.parse(entryValveProcessor, siddhiQueryContext.getSiddhiAppContext());
-        streamPreStateProcessor.setScheduler(scheduler);
-        return streamPreStateProcessor;
-    }
-
     @Override
     public void start() {
         // Start automatically only if it is the start state and 'for' time is defined
         // Otherwise, scheduler will be started in the addState method
-        if (isStartState && waitingTime != -1 && active) {
-            synchronized (this) {
-                lastScheduledTime = this.siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime()
-                        + waitingTime;
-                this.scheduler.notifyAt(lastScheduledTime);
+        LogicalStreamPreState state = (LogicalStreamPreState) stateHolder.getState();
+
+        try {
+            if (!state.isStarted()) {
+                state.started();
+                if (isStartState && waitingTime != -1 && state.active) {
+                    synchronized (this) {
+                        state.lastScheduledTime = this.siddhiQueryContext.getSiddhiAppContext()
+                                .getTimestampGenerator().currentTime() + waitingTime;
+                        this.scheduler.notifyAt(state.lastScheduledTime);
+                    }
+                }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
     }
 
@@ -291,4 +299,38 @@ public void stop() {
         // Scheduler will be stopped automatically
         // Nothing to stop here
     }
+
+    class LogicalStreamPreState extends StreamPreState {
+
+        /**
+         * The timestamp of the last event scheduled by this processor.
+         */
+        private long lastScheduledTime;
+
+        /**
+         * This flag turns to false after processing the first event if 'every' is not used.
+         * This is used to process only one pattern if 'every' is not used.
+         */
+        private boolean active = true;
+
+        @Override
+        public boolean canDestroy() {
+            return super.canDestroy();
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> snapshot = super.snapshot();
+            snapshot.put("IsActive", active);
+            snapshot.put("LastScheduledTime", lastScheduledTime);
+            return snapshot;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            super.restore(state);
+            active = (Boolean) state.get("IsActive");
+            lastScheduledTime = (Long) state.get("LastScheduledTime");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/CountPostStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/CountPostStateProcessor.java
index 31d196ec9a..34339d29cf 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/CountPostStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/CountPostStateProcessor.java
@@ -36,12 +36,6 @@ public CountPostStateProcessor(int minCount, int maxCount) {
         this.maxCount = maxCount;
     }
 
-    public PostStateProcessor cloneProcessor(String key) {
-        CountPostStateProcessor countPostStateProcessor = new CountPostStateProcessor(minCount, maxCount);
-        cloneProperties(countPostStateProcessor);
-        return countPostStateProcessor;
-    }
-
     protected void process(StateEvent stateEvent, ComplexEventChunk complexEventChunk) {
         StreamEvent streamEvent = stateEvent.getStreamEvent(stateId);
         int streamEvents = 1;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/CountPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/CountPreStateProcessor.java
index 0f592f03be..e8e55618db 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/CountPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/CountPreStateProcessor.java
@@ -18,12 +18,14 @@
 
 package io.siddhi.core.query.input.stream.state;
 
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Created on 1/6/15.
@@ -31,9 +33,7 @@
 public class CountPreStateProcessor extends StreamPreStateProcessor {
     private final int minCount;
     private final int maxCount;
-    protected volatile boolean successCondition = false;
     private CountPostStateProcessor countPostStateProcessor;
-    private volatile boolean startStateReset = false;
 
     public CountPreStateProcessor(int minCount, int maxCount, StateInputStream.Type stateType) {
         super(stateType);
@@ -41,12 +41,11 @@ public CountPreStateProcessor(int minCount, int maxCount, StateInputStream.Type
         this.maxCount = maxCount;
     }
 
-
-    public PreStateProcessor cloneProcessor(String key) {
-        CountPreStateProcessor countPreStateProcessor = new CountPreStateProcessor(minCount, maxCount, stateType);
-        cloneProperties(countPreStateProcessor, key);
-        countPreStateProcessor.init(siddhiQueryContext);
-        return countPreStateProcessor;
+    public void init(SiddhiQueryContext siddhiQueryContext) {
+        this.siddhiQueryContext = siddhiQueryContext;
+        this.stateHolder = siddhiQueryContext.generateStateHolder(
+                this.getClass().getName(),
+                false, () -> new CountStreamPreState());
     }
 
     @Override
@@ -54,9 +53,10 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
         ComplexEventChunk<StateEvent> returnEventChunk = new ComplexEventChunk<StateEvent>(false);
         complexEventChunk.reset();
         StreamEvent streamEvent = (StreamEvent) complexEventChunk.next(); //Sure only one will be sent
+        CountStreamPreState state = (CountStreamPreState) stateHolder.getState();
         lock.lock();
         try {
-            for (Iterator<StateEvent> iterator = pendingStateEventList.iterator(); iterator.hasNext(); ) {
+            for (Iterator<StateEvent> iterator = state.getPendingStateEventList().iterator(); iterator.hasNext(); ) {
                 StateEvent stateEvent = iterator.next();
                 if (removeIfNextStateProcessed(stateEvent, iterator, stateId + 1)) {
                     continue;
@@ -65,16 +65,16 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
                     continue;
                 }
                 stateEvent.addEvent(stateId, streamEventCloner.copyStreamEvent(streamEvent));
-                successCondition = false;
+                state.successCondition = false;
                 process(stateEvent);
                 if (this.thisLastProcessor.isEventReturned()) {
                     this.thisLastProcessor.clearProcessedEvent();
                     returnEventChunk.add(stateEvent);
                 }
-                if (stateChanged) {
+                if (state.isStateChanged()) {
                     iterator.remove();
                 }
-                if (!successCondition) {
+                if (!state.successCondition) {
                     switch (stateType) {
                         case PATTERN:
                             stateEvent.removeLastEvent(stateId);
@@ -88,6 +88,7 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
             }
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
         return returnEventChunk;
     }
@@ -101,12 +102,15 @@ private boolean removeIfNextStateProcessed(StateEvent stateEvent, Iterator<State
     }
 
     public void successCondition() {
-        this.successCondition = true;
+        CountStreamPreState state = (CountStreamPreState) stateHolder.getState();
+        try {
+            state.successCondition = true;
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
-
-    @Override
-    public void addState(StateEvent stateEvent) {
+    protected void addState(StateEvent stateEvent, StreamPreState state) {
         //        if (stateType == StateInputStream.Type.SEQUENCE) {
         //            newAndEveryStateEventList.clear();
         //            pendingStateEventList.clear();
@@ -114,20 +118,21 @@ public void addState(StateEvent stateEvent) {
         lock.lock();
         try {
             if (stateType == StateInputStream.Type.SEQUENCE) {
-                if (newAndEveryStateEventList.isEmpty()) {
-                    newAndEveryStateEventList.add(stateEvent);
+                if (state.getNewAndEveryStateEventList().isEmpty()) {
+                    state.getNewAndEveryStateEventList().add(stateEvent);
                 }
             } else {
-                newAndEveryStateEventList.add(stateEvent);
+                state.getNewAndEveryStateEventList().add(stateEvent);
             }
         } finally {
             lock.unlock();
         }
         if (minCount == 0 && stateEvent.getStreamEvent(stateId) == null) {
-            currentStateEventChunk.clear();
-            currentStateEventChunk.add(stateEvent);
-            countPostStateProcessor.processMinCountReached(stateEvent, currentStateEventChunk);
-            currentStateEventChunk.clear();
+            ComplexEventChunk<StateEvent> eventChunk = state.getCurrentStateEventChunk();
+            eventChunk.clear();
+            eventChunk.add(stateEvent);
+            countPostStateProcessor.processMinCountReached(stateEvent, eventChunk);
+            eventChunk.clear();
         }
     }
 
@@ -140,18 +145,56 @@ public void setCountPostStateProcessor(CountPostStateProcessor countPostStatePro
     }
 
     public void startStateReset() {
-        startStateReset = true;
-        if (thisStatePostProcessor.callbackPreStateProcessor != null) {
-            ((CountPreStateProcessor) countPostStateProcessor.thisStatePreProcessor).startStateReset();
+        CountStreamPreState state = (CountStreamPreState) stateHolder.getState();
+        try {
+            state.startStateReset = true;
+            if (thisStatePostProcessor.callbackPreStateProcessor != null) {
+                ((CountPreStateProcessor) countPostStateProcessor.thisStatePreProcessor).startStateReset();
+            }
+        } finally {
+            stateHolder.returnState(state);
         }
+
     }
 
     @Override
     public void updateState() {
-        if (startStateReset) {
-            startStateReset = false;
-            init();
+        CountStreamPreState state = (CountStreamPreState) stateHolder.getState();
+        try {
+            if (state.startStateReset) {
+                state.startStateReset = false;
+                init();
+            }
+            super.updateState();
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    class CountStreamPreState extends StreamPreState {
+
+        protected volatile boolean successCondition = false;
+
+        private volatile boolean startStateReset = false;
+
+        @Override
+        public boolean canDestroy() {
+            return super.canDestroy();
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> snapshot = super.snapshot();
+            snapshot.put("SuccessCondition", successCondition);
+            snapshot.put("StartStateReset", startStateReset);
+            return snapshot;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            super.restore(state);
+            successCondition = (Boolean) state.get("SuccessCondition");
+            startStateReset = (Boolean) state.get("StartStateReset");
         }
-        super.updateState();
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/LogicalPostStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/LogicalPostStateProcessor.java
index 7231039d8e..37d916c033 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/LogicalPostStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/LogicalPostStateProcessor.java
@@ -118,19 +118,6 @@ public void setToLast(Processor processor) {
         }
     }
 
-    /**
-     * Clone a copy of processor
-     *
-     * @param key partition key
-     * @return clone of PostStateProcessor
-     */
-    @Override
-    public PostStateProcessor cloneProcessor(String key) {
-        LogicalPostStateProcessor logicalPostStateProcessor = new LogicalPostStateProcessor(type);
-        cloneProperties(logicalPostStateProcessor);
-        return logicalPostStateProcessor;
-    }
-
     public void setNextStatePreProcessor(PreStateProcessor preStateProcessor) {
         this.nextStatePreProcessor = preStateProcessor;
         partnerPostStateProcessor.nextStatePreProcessor = preStateProcessor;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/LogicalPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/LogicalPreStateProcessor.java
index 0c44624a02..e590f69b8f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/LogicalPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/LogicalPreStateProcessor.java
@@ -39,35 +39,20 @@ public LogicalPreStateProcessor(LogicalStateElement.Type type, StateInputStream.
         this.logicalType = type;
     }
 
-    /**
-     * Clone a copy of processor
-     *
-     * @param key partition key
-     * @return clone of LogicalPreStateProcessor
-     */
-    @Override
-    public PreStateProcessor cloneProcessor(String key) {
-        LogicalPreStateProcessor logicalPreStateProcessor = new LogicalPreStateProcessor(logicalType, stateType);
-        cloneProperties(logicalPreStateProcessor, key);
-        logicalPreStateProcessor.init(siddhiQueryContext);
-        return logicalPreStateProcessor;
-    }
-
-    @Override
-    public void addState(StateEvent stateEvent) {
+    protected void addState(StateEvent stateEvent, StreamPreState state) {
         lock.lock();
         try {
             if (isStartState || stateType == StateInputStream.Type.SEQUENCE) {
-                if (newAndEveryStateEventList.isEmpty()) {
-                    newAndEveryStateEventList.add(stateEvent);
+                if (state.getNewAndEveryStateEventList().isEmpty()) {
+                    state.getNewAndEveryStateEventList().add(stateEvent);
                 }
-                if (partnerStatePreProcessor != null && partnerStatePreProcessor.newAndEveryStateEventList.isEmpty()) {
-                    partnerStatePreProcessor.newAndEveryStateEventList.add(stateEvent);
+                if (partnerStatePreProcessor != null && partnerStatePreProcessor.isNewAndEveryStateEventListEmpty()) {
+                    partnerStatePreProcessor.addEventToNewAndEveryStateEventList(stateEvent);
                 }
             } else {
-                newAndEveryStateEventList.add(stateEvent);
+                state.getNewAndEveryStateEventList().add(stateEvent);
                 if (partnerStatePreProcessor != null) {
-                    partnerStatePreProcessor.newAndEveryStateEventList.add(stateEvent);
+                    partnerStatePreProcessor.addEventToNewAndEveryStateEventList(stateEvent);
                 }
             }
         } finally {
@@ -79,32 +64,35 @@ public void addState(StateEvent stateEvent) {
     public void addEveryState(StateEvent stateEvent) {
         StateEvent clonedEvent = stateEventCloner.copyStateEvent(stateEvent);
         clonedEvent.setEvent(stateId, null);
+        StreamPreState state = stateHolder.getState();
         lock.lock();
         try {
-            newAndEveryStateEventList.add(clonedEvent);
+            state.getNewAndEveryStateEventList().add(clonedEvent);
             if (partnerStatePreProcessor != null) {
                 clonedEvent.setEvent(partnerStatePreProcessor.stateId, null);
-                partnerStatePreProcessor.newAndEveryStateEventList.add(clonedEvent);
+                partnerStatePreProcessor.addEventToNewAndEveryStateEventList(clonedEvent);
             }
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
     }
 
     @Override
     public void resetState() {
+        StreamPreState state = stateHolder.getState();
         lock.lock();
         try {
-            if (logicalType == LogicalStateElement.Type.OR || pendingStateEventList.size() ==
-                    partnerStatePreProcessor.pendingStateEventList.size()) {
-                pendingStateEventList.clear();
-                partnerStatePreProcessor.pendingStateEventList.clear();
+            if (logicalType == LogicalStateElement.Type.OR || state.getPendingStateEventList().size() ==
+                    partnerStatePreProcessor.getPendingStateEventList().size()) {
+                state.getPendingStateEventList().clear();
+                partnerStatePreProcessor.getPendingStateEventList().clear();
 
-                if (isStartState && newAndEveryStateEventList.isEmpty()) {
+                if (isStartState && state.getNewAndEveryStateEventList().isEmpty()) {
                     if (stateType == StateInputStream.Type.SEQUENCE &&
                             thisStatePostProcessor.nextEveryStatePreProcessor == null &&
                             !((StreamPreStateProcessor) thisStatePostProcessor.nextStatePreProcessor)
-                                    .pendingStateEventList.isEmpty()) {
+                                    .getPendingStateEventList().isEmpty()) {
                         return;
                     }
                     init();
@@ -112,20 +100,21 @@ public void resetState() {
             }
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
     }
 
     @Override
     public void updateState() {
+        StreamPreState state = stateHolder.getState();
         lock.lock();
         try {
-            pendingStateEventList.addAll(newAndEveryStateEventList);
-            newAndEveryStateEventList.clear();
-
-            partnerStatePreProcessor.pendingStateEventList.addAll(partnerStatePreProcessor.newAndEveryStateEventList);
-            partnerStatePreProcessor.newAndEveryStateEventList.clear();
+            state.getPendingStateEventList().addAll(state.getNewAndEveryStateEventList());
+            state.getNewAndEveryStateEventList().clear();
+            partnerStatePreProcessor.moveAllNewAndEveryStateEventListEventsToPendingStateEventList();
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
     }
 
@@ -134,9 +123,10 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
         ComplexEventChunk<StateEvent> returnEventChunk = new ComplexEventChunk<StateEvent>(false);
         complexEventChunk.reset();
         StreamEvent streamEvent = (StreamEvent) complexEventChunk.next(); //Sure only one will be sent
+        StreamPreState state = stateHolder.getState();
         lock.lock();
         try {
-            for (Iterator<StateEvent> iterator = pendingStateEventList.iterator(); iterator.hasNext(); ) {
+            for (Iterator<StateEvent> iterator = state.getPendingStateEventList().iterator(); iterator.hasNext(); ) {
                 StateEvent stateEvent = iterator.next();
                 if (isExpired(stateEvent, streamEvent.getTimestamp())) {
                     iterator.remove();
@@ -157,7 +147,7 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
                     this.thisLastProcessor.clearProcessedEvent();
                     returnEventChunk.add(stateEvent);
                 }
-                if (stateChanged) {
+                if (state.isStateChanged()) {
                     iterator.remove();
                 } else {
                     switch (stateType) {
@@ -173,6 +163,7 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
             }
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
         return returnEventChunk;
     }
@@ -181,4 +172,32 @@ public void setPartnerStatePreProcessor(LogicalPreStateProcessor partnerStatePre
         this.partnerStatePreProcessor = partnerStatePreProcessor;
         partnerStatePreProcessor.lock = lock;
     }
+
+    public void moveAllNewAndEveryStateEventListEventsToPendingStateEventList() {
+        StreamPreState state = stateHolder.getState();
+        try {
+            state.getPendingStateEventList().addAll(state.getNewAndEveryStateEventList());
+            state.getNewAndEveryStateEventList().clear();
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    public boolean isNewAndEveryStateEventListEmpty() {
+        StreamPreState state = stateHolder.getState();
+        try {
+            return state.getNewAndEveryStateEventList().isEmpty();
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    public void addEventToNewAndEveryStateEventList(StateEvent event) {
+        StreamPreState state = stateHolder.getState();
+        try {
+            state.getNewAndEveryStateEventList().add(event);
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/PostStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/PostStateProcessor.java
index 487f511132..a5339aed82 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/PostStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/PostStateProcessor.java
@@ -33,6 +33,4 @@ public interface PostStateProcessor extends Processor {
 
     void setCallbackPreStateProcessor(CountPreStateProcessor callbackPreStateProcessor);
 
-    PostStateProcessor cloneProcessor(String key);
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/PreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/PreStateProcessor.java
index f2178cd55f..6898efcaee 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/PreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/PreStateProcessor.java
@@ -55,6 +55,4 @@ public interface PreStateProcessor extends Processor {
 
     void setStartStateIds(int[] stateIds);
 
-    PreStateProcessor cloneProcessor(String key);
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StateStreamRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StateStreamRuntime.java
index 371d29f106..0f26db3900 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StateStreamRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StateStreamRuntime.java
@@ -22,14 +22,12 @@
 import io.siddhi.core.event.MetaComplexEvent;
 import io.siddhi.core.event.state.MetaStateEvent;
 import io.siddhi.core.event.state.StateEvent;
-import io.siddhi.core.query.input.ProcessStreamReceiver;
 import io.siddhi.core.query.input.stream.StreamRuntime;
 import io.siddhi.core.query.input.stream.single.SingleStreamRuntime;
-import io.siddhi.core.query.input.stream.state.receiver.SequenceMultiProcessStreamReceiver;
-import io.siddhi.core.query.input.stream.state.receiver.SequenceSingleProcessStreamReceiver;
 import io.siddhi.core.query.input.stream.state.runtime.InnerStateRuntime;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 
 import java.util.List;
 
@@ -40,10 +38,9 @@ public class StateStreamRuntime implements StreamRuntime {
 
     private MetaStateEvent metaStateEvent;
     private InnerStateRuntime innerStateRuntime;
-    private SiddhiQueryContext siddhiQueryContext;
+    private List<PreStateProcessor> startupPreStateProcessors;
 
     public StateStreamRuntime(SiddhiQueryContext siddhiQueryContext, MetaStateEvent metaStateEvent) {
-        this.siddhiQueryContext = siddhiQueryContext;
         this.metaStateEvent = metaStateEvent;
     }
 
@@ -51,28 +48,10 @@ public List<SingleStreamRuntime> getSingleStreamRuntimes() {
         return innerStateRuntime.getSingleStreamRuntimeList();
     }
 
-    @Override
-    public StreamRuntime clone(String key) {
-        StateStreamRuntime stateStreamRuntime = new StateStreamRuntime(siddhiQueryContext, metaStateEvent);
-        stateStreamRuntime.innerStateRuntime = this.innerStateRuntime.clone(key);
-        for (SingleStreamRuntime singleStreamRuntime : stateStreamRuntime.getSingleStreamRuntimes()) {
-            ProcessStreamReceiver processStreamReceiver = singleStreamRuntime.getProcessStreamReceiver();
-            if (processStreamReceiver instanceof SequenceMultiProcessStreamReceiver) {
-                ((SequenceMultiProcessStreamReceiver) processStreamReceiver).setStateStreamRuntime(stateStreamRuntime);
-            } else if (processStreamReceiver instanceof SequenceSingleProcessStreamReceiver) {
-                ((SequenceSingleProcessStreamReceiver) processStreamReceiver).setStateStreamRuntime(stateStreamRuntime);
-            }
-        }
-        ((StreamPreStateProcessor) stateStreamRuntime.innerStateRuntime.getFirstProcessor()).setThisLastProcessor(
-                (StreamPostStateProcessor)
-                        stateStreamRuntime.innerStateRuntime.getLastProcessor());
-        return stateStreamRuntime;
-    }
-
     @Override
     public void setCommonProcessor(Processor commonProcessor) {
         innerStateRuntime.setQuerySelector(commonProcessor);
-        innerStateRuntime.init();
+        innerStateRuntime.setup();
     }
 
     @Override
@@ -97,4 +76,17 @@ public void resetAndUpdate() {
         innerStateRuntime.reset();
         innerStateRuntime.update();
     }
+
+    public void setStartupPreStateProcessors(List<PreStateProcessor> startupPreStateProcessors) {
+        this.startupPreStateProcessors = startupPreStateProcessors;
+    }
+
+    public void start() {
+        innerStateRuntime.init();
+        for (PreStateProcessor preStateProcessor : startupPreStateProcessors) {
+            if (preStateProcessor instanceof ExternalReferencedHolder) {
+                ((ExternalReferencedHolder) preStateProcessor).start();
+            }
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPostStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPostStateProcessor.java
index 60285014b3..b797c1fa2b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPostStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPostStateProcessor.java
@@ -113,28 +113,6 @@ public void setToLast(Processor processor) {
         }
     }
 
-    /**
-     * Clone a copy of processor
-     *
-     * @param key partition key
-     * @return clone of StreamPostStateProcessor
-     */
-    @Override
-    public PostStateProcessor cloneProcessor(String key) {
-        StreamPostStateProcessor streamPostStateProcessor = new StreamPostStateProcessor();
-        cloneProperties(streamPostStateProcessor);
-        return streamPostStateProcessor;
-    }
-
-    @Override
-    public void clean() {
-        //ignore
-    }
-
-    protected void cloneProperties(StreamPostStateProcessor streamPostStateProcessor) {
-        streamPostStateProcessor.stateId = stateId;
-    }
-
     public PreStateProcessor getNextStatePreProcessor() {
         return nextStatePreProcessor;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPreStateProcessor.java
index 1da6c26612..f362d0c4fa 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPreStateProcessor.java
@@ -27,36 +27,32 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.SiddhiConstants;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * The processor the gets executes before checking state conditions.
  */
-public class StreamPreStateProcessor implements PreStateProcessor, Snapshotable {
+public class StreamPreStateProcessor implements PreStateProcessor {
 
     protected int stateId;
     protected boolean isStartState;
-    protected volatile boolean stateChanged = false;
     protected StateInputStream.Type stateType;
     protected long withinTime = SiddhiConstants.UNKNOWN_STATE;
     protected int[] startStateIds;
     protected PreStateProcessor withinEveryPreStateProcessor;
-    protected String elementId;
     protected StreamPostStateProcessor thisStatePostProcessor;
     protected StreamPostStateProcessor thisLastProcessor;
-
     protected Processor nextProcessor;
 
-    protected ComplexEventChunk<StateEvent> currentStateEventChunk = new ComplexEventChunk<StateEvent>(false);
-    protected LinkedList<StateEvent> pendingStateEventList = new LinkedList<StateEvent>();
-    protected LinkedList<StateEvent> newAndEveryStateEventList = new LinkedList<StateEvent>();
     protected ReentrantLock lock = new ReentrantLock();
 
     protected StateEventPool stateEventPool;
@@ -64,7 +60,7 @@ public class StreamPreStateProcessor implements PreStateProcessor, Snapshotable
     protected StateEventCloner stateEventCloner;
     protected StreamEventPool streamEventPool;
     protected SiddhiQueryContext siddhiQueryContext;
-    private boolean initialized;
+    protected StateHolder<StreamPreState> stateHolder;
 
     public StreamPreStateProcessor(StateInputStream.Type stateType) {
         this.stateType = stateType;
@@ -72,12 +68,9 @@ public StreamPreStateProcessor(StateInputStream.Type stateType) {
 
     public void init(SiddhiQueryContext siddhiQueryContext) {
         this.siddhiQueryContext = siddhiQueryContext;
-        if (elementId == null) {
-            this.elementId = "StreamPreStateProcessor-" +
-                    siddhiQueryContext.getSiddhiAppContext().getElementIdGenerator().createNewId();
-        }
-        siddhiQueryContext.getSiddhiAppContext().getSnapshotService().addSnapshotable(
-                siddhiQueryContext.getName(), this);
+        this.stateHolder = siddhiQueryContext.generateStateHolder(
+                this.getClass().getName(),
+                false, () -> new StreamPreState());
     }
 
     public StreamPostStateProcessor getThisStatePostProcessor() {
@@ -113,11 +106,16 @@ protected boolean isExpired(StateEvent pendingStateEvent, long currentTimestamp)
     }
 
     protected void process(StateEvent stateEvent) {
-        currentStateEventChunk.add(stateEvent);
-        currentStateEventChunk.reset();
-        stateChanged = false;
-        nextProcessor.process(currentStateEventChunk);
-        currentStateEventChunk.reset();
+        StreamPreState state = stateHolder.getState();
+        try {
+            state.currentStateEventChunk.add(stateEvent);
+            state.currentStateEventChunk.reset();
+            state.stateChanged = false;
+            nextProcessor.process(state.currentStateEventChunk);
+            state.currentStateEventChunk.reset();
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     /**
@@ -155,13 +153,20 @@ public void setToLast(Processor processor) {
     }
 
     public void init() {
-        if (isStartState && (!initialized || this.thisStatePostProcessor.nextEveryStatePreProcessor != null ||
-                (stateType == StateInputStream.Type.SEQUENCE &&
-                        this.thisStatePostProcessor.nextStatePreProcessor instanceof AbsentPreStateProcessor))) {
-            // For 'every' sequence, the 'thisStatePostProcessor.nextEveryStatePreProcessor != null' check is not enough
-            StateEvent stateEvent = stateEventPool.borrowEvent();
-            addState(stateEvent);
-            initialized = true;
+        StreamPreState state = stateHolder.getState();
+        try {
+            if (isStartState && (!state.initialized ||
+                    this.thisStatePostProcessor.nextEveryStatePreProcessor != null ||
+                    (stateType == StateInputStream.Type.SEQUENCE && this.thisStatePostProcessor.nextStatePreProcessor
+                            instanceof AbsentPreStateProcessor))) {
+                // For 'every' sequence, the 'thisStatePostProcessor.nextEveryStatePreProcessor != null'
+                // check is not enough
+                StateEvent stateEvent = stateEventPool.borrowEvent();
+                addState(stateEvent);
+                state.initialized = true;
+            }
+        } finally {
+            stateHolder.returnState(state);
         }
     }
 
@@ -173,42 +178,25 @@ public void setThisLastProcessor(StreamPostStateProcessor thisLastProcessor) {
         this.thisLastProcessor = thisLastProcessor;
     }
 
-    /**
-     * Clone a copy of processor
-     *
-     * @param key partition key
-     * @return clone of StreamPreStateProcessor
-     */
     @Override
-    public PreStateProcessor cloneProcessor(String key) {
-        StreamPreStateProcessor streamPreStateProcessor = new StreamPreStateProcessor(stateType);
-        cloneProperties(streamPreStateProcessor, key);
-        streamPreStateProcessor.init(siddhiQueryContext);
-        return streamPreStateProcessor;
-    }
-
-    protected void cloneProperties(StreamPreStateProcessor streamPreStateProcessor, String key) {
-        streamPreStateProcessor.stateId = this.stateId;
-        streamPreStateProcessor.isStartState = this.isStartState;
-        streamPreStateProcessor.elementId = this.elementId + "-" + key;
-        streamPreStateProcessor.stateEventPool = this.stateEventPool;
-        streamPreStateProcessor.streamEventCloner = this.streamEventCloner;
-        streamPreStateProcessor.stateEventCloner = this.stateEventCloner;
-        streamPreStateProcessor.streamEventPool = this.streamEventPool;
-        streamPreStateProcessor.withinTime = this.withinTime;
-        streamPreStateProcessor.startStateIds = this.startStateIds;
+    public void addState(StateEvent stateEvent) {
+        StreamPreState state = stateHolder.getState();
+        try {
+            addState(stateEvent, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
-    @Override
-    public void addState(StateEvent stateEvent) {
+    protected void addState(StateEvent stateEvent, StreamPreState state) {
         lock.lock();
         try {
             if (stateType == StateInputStream.Type.SEQUENCE) {
-                if (newAndEveryStateEventList.isEmpty()) {
-                    newAndEveryStateEventList.add(stateEvent);
+                if (state.newAndEveryStateEventList.isEmpty()) {
+                    state.newAndEveryStateEventList.add(stateEvent);
                 }
             } else {
-                newAndEveryStateEventList.add(stateEvent);
+                state.newAndEveryStateEventList.add(stateEvent);
             }
         } finally {
             lock.unlock();
@@ -220,7 +208,12 @@ public void addEveryState(StateEvent stateEvent) {
         lock.lock();
         try {
             StateEvent clonedEvent = stateEventCloner.copyStateEvent(stateEvent);
-            newAndEveryStateEventList.add(clonedEvent);
+            StreamPreState state = stateHolder.getState();
+            try {
+                state.newAndEveryStateEventList.add(clonedEvent);
+            } finally {
+                stateHolder.returnState(state);
+            }
         } finally {
             lock.unlock();
         }
@@ -231,7 +224,12 @@ public void setWithinEveryPreStateProcessor(PreStateProcessor withinEveryPreStat
     }
 
     public void stateChanged() {
-        stateChanged = true;
+        StreamPreState state = stateHolder.getState();
+        try {
+            state.stateChanged = true;
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
@@ -261,19 +259,21 @@ public void setStateEventCloner(StateEventCloner stateEventCloner) {
 
     @Override
     public void resetState() {
+        StreamPreState state = stateHolder.getState();
         lock.lock();
         try {
-            pendingStateEventList.clear();
-            if (isStartState && newAndEveryStateEventList.isEmpty()) {
+            state.pendingStateEventList.clear();
+            if (isStartState && state.newAndEveryStateEventList.isEmpty()) {
                 if (stateType == StateInputStream.Type.SEQUENCE && thisStatePostProcessor.nextEveryStatePreProcessor ==
-                        null && !((StreamPreStateProcessor) thisStatePostProcessor.nextStatePreProcessor)
-                        .pendingStateEventList.isEmpty()) {
+                        null && !((StreamPreStateProcessor) thisStatePostProcessor.nextStatePreProcessor).
+                        getPendingStateEventList().isEmpty()) {
                     return;
                 }
                 init();
             }
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
     }
 
@@ -281,8 +281,14 @@ public void resetState() {
     public void updateState() {
         lock.lock();
         try {
-            pendingStateEventList.addAll(newAndEveryStateEventList);
-            newAndEveryStateEventList.clear();
+            StreamPreState state = stateHolder.getState();
+            try {
+                state.pendingStateEventList.addAll(state.newAndEveryStateEventList);
+                state.newAndEveryStateEventList.clear();
+            } finally {
+                stateHolder.returnState(state);
+            }
+
         } finally {
             lock.unlock();
         }
@@ -293,9 +299,10 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
         ComplexEventChunk<StateEvent> returnEventChunk = new ComplexEventChunk<StateEvent>(false);
         complexEventChunk.reset();
         StreamEvent streamEvent = (StreamEvent) complexEventChunk.next(); //Sure only one will be sent
+        StreamPreState state = stateHolder.getState();
         lock.lock();
         try {
-            for (Iterator<StateEvent> iterator = pendingStateEventList.iterator(); iterator.hasNext(); ) {
+            for (Iterator<StateEvent> iterator = state.pendingStateEventList.iterator(); iterator.hasNext(); ) {
                 StateEvent stateEvent = iterator.next();
                 if (isExpired(stateEvent, streamEvent.getTimestamp())) {
                     iterator.remove();
@@ -311,7 +318,7 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
                     this.thisLastProcessor.clearProcessedEvent();
                     returnEventChunk.add(stateEvent);
                 }
-                if (stateChanged) {
+                if (state.stateChanged) {
                     iterator.remove();
                 } else {
                     switch (stateType) {
@@ -332,6 +339,7 @@ public ComplexEventChunk<StateEvent> processAndReturn(ComplexEventChunk complexE
             }
         } finally {
             lock.unlock();
+            stateHolder.returnState(state);
         }
         return returnEventChunk;
     }
@@ -349,42 +357,100 @@ public void setStateId(int stateId) {
         this.stateId = stateId;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("FirstEvent", currentStateEventChunk.getFirst());
-        state.put("PendingStateEventList", pendingStateEventList);
-        state.put("NewAndEveryStateEventList", newAndEveryStateEventList);
-        return state;
+    public void setWithinTime(long withinTime) {
+        this.withinTime = withinTime;
     }
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        currentStateEventChunk.clear();
-        currentStateEventChunk.add((StateEvent) state.get("FirstEvent"));
-        pendingStateEventList = (LinkedList<StateEvent>) state.get("PendingStateEventList");
-        newAndEveryStateEventList = (LinkedList<StateEvent>) state.get("NewAndEveryStateEventList");
+    public void setStartStateIds(int[] stateIds) {
+        this.startStateIds = stateIds;
     }
 
-    @Override
-    public String getElementId() {
-        return elementId;
+    public List<StateEvent> getPendingStateEventList() {
+        StreamPreState state = stateHolder.getState();
+        try {
+            return state.pendingStateEventList;
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
-    @Override
-    public void clean() {
-        if (nextProcessor != null) {
-            nextProcessor.clean();
+    class StreamPreState extends State {
+        private ComplexEventChunk<StateEvent> currentStateEventChunk = new ComplexEventChunk<StateEvent>(false);
+        private LinkedList<StateEvent> pendingStateEventList = new LinkedList<StateEvent>();
+        private LinkedList<StateEvent> newAndEveryStateEventList = new LinkedList<StateEvent>();
+        private volatile boolean stateChanged = false;
+        private boolean initialized;
+        private boolean started;
+
+//        public StreamPreState() {
+//            if (initAtStartup && isStartState &&
+//                    (!initialized || thisStatePostProcessor.nextEveryStatePreProcessor != null ||
+//                            (stateType == StateInputStream.Type.SEQUENCE &&
+//                                    thisStatePostProcessor.nextStatePreProcessor instanceof
+//                                                      AbsentPreStateProcessor))) {
+//                // For 'every' sequence, the 'thisStatePostProcessor.nextEveryStatePreProcessor != null'
+//                // check is not enough
+//                StateEvent stateEvent = stateEventPool.borrowEvent();
+//                addState(stateEvent, this);
+//                initialized = true;
+//            }
+//        }
+
+        @Override
+        public boolean canDestroy() {
+            return currentStateEventChunk.getFirst() == null &&
+                    pendingStateEventList.isEmpty() &&
+                    newAndEveryStateEventList.isEmpty() && !initialized;
         }
-        siddhiQueryContext.getSiddhiAppContext().getSnapshotService().removeSnapshotable(
-                siddhiQueryContext.getName(), this);
-    }
 
-    public void setWithinTime(long withinTime) {
-        this.withinTime = withinTime;
-    }
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("FirstEvent", currentStateEventChunk.getFirst());
+            state.put("PendingStateEventList", pendingStateEventList);
+            state.put("NewAndEveryStateEventList", newAndEveryStateEventList);
+            state.put("Initialized", initialized);
+            state.put("Started", started);
+            return state;
+        }
 
-    public void setStartStateIds(int[] stateIds) {
-        this.startStateIds = stateIds;
+        @Override
+        public void restore(Map<String, Object> state) {
+            currentStateEventChunk.clear();
+            currentStateEventChunk.add((StateEvent) state.get("FirstEvent"));
+            pendingStateEventList = (LinkedList<StateEvent>) state.get("PendingStateEventList");
+            newAndEveryStateEventList = (LinkedList<StateEvent>) state.get("NewAndEveryStateEventList");
+            initialized = (Boolean) state.get("Initialized");
+            started = (Boolean) state.get("Started");
+        }
+
+        public ComplexEventChunk<StateEvent> getCurrentStateEventChunk() {
+            return currentStateEventChunk;
+        }
+
+        public LinkedList<StateEvent> getPendingStateEventList() {
+            return pendingStateEventList;
+        }
+
+        public LinkedList<StateEvent> getNewAndEveryStateEventList() {
+            return newAndEveryStateEventList;
+        }
+
+        public boolean isStateChanged() {
+            return stateChanged;
+        }
+
+        public void setStateChanged(boolean stateChanged) {
+            this.stateChanged = stateChanged;
+        }
+
+        public void started() {
+            started = true;
+        }
+
+        public boolean isStarted() {
+            return started;
+        }
     }
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternMultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternMultiProcessStreamReceiver.java
index eca517f441..580fb13971 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternMultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternMultiProcessStreamReceiver.java
@@ -43,11 +43,6 @@ public PatternMultiProcessStreamReceiver(String streamId, int processCount,
         }
     }
 
-    public PatternMultiProcessStreamReceiver clone(String key) {
-        return new PatternMultiProcessStreamReceiver(streamId + key, processCount,
-                siddhiQueryContext);
-    }
-
     protected void stabilizeStates() {
         if (stateProcessorsSize != 0) {
             for (PreStateProcessor preStateProcessor : stateProcessors) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternSingleProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternSingleProcessStreamReceiver.java
index 731d6585ee..a5701adc51 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternSingleProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternSingleProcessStreamReceiver.java
@@ -34,11 +34,6 @@ public PatternSingleProcessStreamReceiver(String streamId, String lockKey, Siddh
         super(streamId, lockKey, siddhiQueryContext);
     }
 
-    public PatternSingleProcessStreamReceiver clone(String key) {
-        return new PatternSingleProcessStreamReceiver(streamId + key, key,
-                siddhiQueryContext);
-    }
-
     protected void stabilizeStates() {
         if (stateProcessorsSize != 0) {
             stateProcessors.get(0).updateState();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceMultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceMultiProcessStreamReceiver.java
index c25a308335..adfe0b0b4a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceMultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceMultiProcessStreamReceiver.java
@@ -46,15 +46,6 @@ public SequenceMultiProcessStreamReceiver(String streamId, int processCount, Sta
         }
     }
 
-    public SequenceMultiProcessStreamReceiver clone(String key) {
-        return new SequenceMultiProcessStreamReceiver(streamId + key, processCount, null,
-                siddhiQueryContext);
-    }
-
-    public void setStateStreamRuntime(StateStreamRuntime stateStreamRuntime) {
-        this.stateStreamRuntime = stateStreamRuntime;
-    }
-
     protected void stabilizeStates() {
         stateStreamRuntime.resetAndUpdate();
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceSingleProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceSingleProcessStreamReceiver.java
index ff7160c357..9e5394bbdf 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceSingleProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceSingleProcessStreamReceiver.java
@@ -40,15 +40,6 @@ public SequenceSingleProcessStreamReceiver(String streamId, StateStreamRuntime s
         this.stateStreamRuntime = stateStreamRuntime;
     }
 
-    public void setStateStreamRuntime(StateStreamRuntime stateStreamRuntime) {
-        this.stateStreamRuntime = stateStreamRuntime;
-    }
-
-    public SequenceSingleProcessStreamReceiver clone(String key) {
-        return new SequenceSingleProcessStreamReceiver(streamId + key, null, key,
-                siddhiQueryContext);
-    }
-
     protected void stabilizeStates() {
         stateStreamRuntime.resetAndUpdate();
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/CountInnerStateRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/CountInnerStateRuntime.java
index 2edde77ec7..e57ffbb1dd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/CountInnerStateRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/CountInnerStateRuntime.java
@@ -18,34 +18,17 @@
 
 package io.siddhi.core.query.input.stream.state.runtime;
 
-import io.siddhi.core.query.input.stream.state.CountPostStateProcessor;
-import io.siddhi.core.query.input.stream.state.CountPreStateProcessor;
-
 /**
  * Created on 12/19/14.
  */
 public class CountInnerStateRuntime extends StreamInnerStateRuntime {
 
-    protected StreamInnerStateRuntime streamInnerStateRuntime;
 
     public CountInnerStateRuntime(StreamInnerStateRuntime streamInnerStateRuntime) {
         super(streamInnerStateRuntime.getStateType());
-        this.streamInnerStateRuntime = streamInnerStateRuntime;
         singleStreamRuntimeList = streamInnerStateRuntime.singleStreamRuntimeList;
         firstProcessor = streamInnerStateRuntime.firstProcessor;
         lastProcessor = streamInnerStateRuntime.lastProcessor;
     }
 
-    @Override
-    public InnerStateRuntime clone(String key) {
-        StreamInnerStateRuntime clonedStreamInnerStateRuntime = (StreamInnerStateRuntime) streamInnerStateRuntime
-                .clone(key);
-        CountPreStateProcessor countPreStateProcessor = (CountPreStateProcessor) clonedStreamInnerStateRuntime
-                .getFirstProcessor();
-        CountPostStateProcessor countPostStateProcessor = (CountPostStateProcessor) clonedStreamInnerStateRuntime
-                .getLastProcessor();
-        countPreStateProcessor.setCountPostStateProcessor(countPostStateProcessor);
-        return new CountInnerStateRuntime(clonedStreamInnerStateRuntime);
-
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/EveryInnerStateRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/EveryInnerStateRuntime.java
index 1bc999316f..ce56101e3c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/EveryInnerStateRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/EveryInnerStateRuntime.java
@@ -39,22 +39,13 @@ public void setQuerySelector(Processor commonProcessor) {
     }
 
     @Override
-    public void init() {
-        innerStateRuntime.init();
+    public void setup() {
+        innerStateRuntime.setup();
     }
 
     @Override
-    public InnerStateRuntime clone(String key) {
-        InnerStateRuntime clonedStreamInnerStateRuntime = innerStateRuntime.clone(key);
-        EveryInnerStateRuntime everyInnerStateRuntime = new EveryInnerStateRuntime(clonedStreamInnerStateRuntime,
-                stateType);
-
-        everyInnerStateRuntime.firstProcessor = clonedStreamInnerStateRuntime.getFirstProcessor();
-        everyInnerStateRuntime.lastProcessor = clonedStreamInnerStateRuntime.getLastProcessor();
-        everyInnerStateRuntime.singleStreamRuntimeList.addAll(clonedStreamInnerStateRuntime
-                .getSingleStreamRuntimeList());
-        everyInnerStateRuntime.getLastProcessor().setNextEveryStatePreProcessor(everyInnerStateRuntime
-                .getFirstProcessor());
-        return everyInnerStateRuntime;
+    public void init() {
+        innerStateRuntime.init();
     }
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/InnerStateRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/InnerStateRuntime.java
index a4e45fc761..36422cb93c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/InnerStateRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/InnerStateRuntime.java
@@ -43,11 +43,12 @@ public interface InnerStateRuntime {
 
     void setQuerySelector(Processor commonProcessor);
 
+    void setup();
+
     void init();
 
     void reset();
 
     void update();
 
-    InnerStateRuntime clone(String key);
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/LogicalInnerStateRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/LogicalInnerStateRuntime.java
index 216eb59982..603a1d9d09 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/LogicalInnerStateRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/LogicalInnerStateRuntime.java
@@ -17,14 +17,9 @@
  */
 package io.siddhi.core.query.input.stream.state.runtime;
 
-import io.siddhi.core.query.input.stream.single.SingleStreamRuntime;
-import io.siddhi.core.query.input.stream.state.LogicalPostStateProcessor;
-import io.siddhi.core.query.input.stream.state.LogicalPreStateProcessor;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 
-import java.util.List;
-
 /**
  * Created on 12/19/14.
  */
@@ -46,6 +41,12 @@ public void setQuerySelector(Processor commonProcessor) {
         innerStateRuntime1.setQuerySelector(commonProcessor);
     }
 
+    @Override
+    public void setup() {
+        innerStateRuntime2.setup();
+        innerStateRuntime1.setup();
+    }
+
     @Override
     public void init() {
         innerStateRuntime2.init();
@@ -62,46 +63,4 @@ public void update() {
         innerStateRuntime2.update();
     }
 
-    @Override
-    public InnerStateRuntime clone(String key) {
-        InnerStateRuntime clonedInnerStateRuntime1 = innerStateRuntime1.clone(key);
-        InnerStateRuntime clonedInnerStateRuntime2 = innerStateRuntime2.clone(key);
-
-        LogicalPreStateProcessor logicalPreStateProcessor1 = (LogicalPreStateProcessor)
-                clonedInnerStateRuntime1.getFirstProcessor();
-        LogicalPostStateProcessor logicalPostStateProcessor1 = (LogicalPostStateProcessor)
-                clonedInnerStateRuntime1.getLastProcessor();
-        LogicalPreStateProcessor logicalPreStateProcessor2 = (LogicalPreStateProcessor)
-                clonedInnerStateRuntime2.getFirstProcessor();
-        LogicalPostStateProcessor logicalPostStateProcessor2 = (LogicalPostStateProcessor)
-                clonedInnerStateRuntime2.getLastProcessor();
-
-        logicalPostStateProcessor1.setPartnerPreStateProcessor(logicalPreStateProcessor2);
-        logicalPostStateProcessor2.setPartnerPreStateProcessor(logicalPreStateProcessor1);
-        logicalPostStateProcessor1.setPartnerPostStateProcessor(logicalPostStateProcessor2);
-        logicalPostStateProcessor2.setPartnerPostStateProcessor(logicalPostStateProcessor1);
-        logicalPreStateProcessor1.setPartnerStatePreProcessor(logicalPreStateProcessor2);
-        logicalPreStateProcessor2.setPartnerStatePreProcessor(logicalPreStateProcessor1);
-
-        LogicalInnerStateRuntime logicalInnerStateRuntime = new LogicalInnerStateRuntime(clonedInnerStateRuntime1,
-                clonedInnerStateRuntime2, stateType);
-        logicalInnerStateRuntime.firstProcessor = clonedInnerStateRuntime1.getFirstProcessor();
-        logicalInnerStateRuntime.lastProcessor = clonedInnerStateRuntime2.getLastProcessor();
-        logicalInnerStateRuntime.getSingleStreamRuntimeList().addAll
-                (clonedInnerStateRuntime2.getSingleStreamRuntimeList());
-        logicalInnerStateRuntime.getSingleStreamRuntimeList().addAll
-                (clonedInnerStateRuntime1.getSingleStreamRuntimeList());
-
-
-        List<SingleStreamRuntime> runtimeList = logicalInnerStateRuntime.getSingleStreamRuntimeList();
-        for (int i = 0; i < runtimeList.size(); i++) {
-            String streamId = runtimeList.get(i).getProcessStreamReceiver().getStreamId();
-            for (int j = i; j < runtimeList.size(); j++) {
-                if (streamId.equals(runtimeList.get(j).getProcessStreamReceiver().getStreamId())) {
-                    runtimeList.get(j).setProcessStreamReceiver(runtimeList.get(i).getProcessStreamReceiver());
-                }
-            }
-        }
-        return logicalInnerStateRuntime;
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/NextInnerStateRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/NextInnerStateRuntime.java
index ff11a7d9c0..7524aa9b08 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/NextInnerStateRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/NextInnerStateRuntime.java
@@ -17,12 +17,9 @@
  */
 package io.siddhi.core.query.input.stream.state.runtime;
 
-import io.siddhi.core.query.input.stream.single.SingleStreamRuntime;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 
-import java.util.List;
-
 /**
  * Created on 12/19/14.
  */
@@ -43,6 +40,12 @@ public void setQuerySelector(Processor commonProcessor) {
         nextInnerStateRuntime.setQuerySelector(commonProcessor);
     }
 
+    @Override
+    public void setup() {
+        currentInnerStateRuntime.setup();
+        nextInnerStateRuntime.setup();
+    }
+
     @Override
     public void init() {
         currentInnerStateRuntime.init();
@@ -60,33 +63,4 @@ public void update() {
         currentInnerStateRuntime.update();
         nextInnerStateRuntime.update();
     }
-
-    @Override
-    public InnerStateRuntime clone(String key) {
-        InnerStateRuntime clonedCurrentInnerStateRuntime = currentInnerStateRuntime.clone(key);
-        InnerStateRuntime clonedNextInnerStateRuntime = nextInnerStateRuntime.clone(key);
-
-        NextInnerStateRuntime nextInnerStateRuntime = new NextInnerStateRuntime(clonedCurrentInnerStateRuntime,
-                clonedNextInnerStateRuntime, stateType);
-        nextInnerStateRuntime.singleStreamRuntimeList.addAll(clonedCurrentInnerStateRuntime
-                .getSingleStreamRuntimeList());
-        nextInnerStateRuntime.singleStreamRuntimeList.addAll(clonedNextInnerStateRuntime.getSingleStreamRuntimeList());
-        nextInnerStateRuntime.firstProcessor = clonedCurrentInnerStateRuntime.getFirstProcessor();
-        nextInnerStateRuntime.lastProcessor = clonedNextInnerStateRuntime.getLastProcessor();
-
-        clonedCurrentInnerStateRuntime.getLastProcessor().setNextStatePreProcessor(clonedNextInnerStateRuntime
-                .getFirstProcessor());
-
-        List<SingleStreamRuntime> runtimeList = nextInnerStateRuntime.getSingleStreamRuntimeList();
-        for (int i = 0; i < runtimeList.size(); i++) {
-            String streamId = runtimeList.get(i).getProcessStreamReceiver().getStreamId();
-            for (int j = i; j < runtimeList.size(); j++) {
-                if (streamId.equals(runtimeList.get(j).getProcessStreamReceiver().getStreamId())) {
-                    runtimeList.get(j).setProcessStreamReceiver(runtimeList.get(i).getProcessStreamReceiver());
-                }
-            }
-        }
-
-        return nextInnerStateRuntime;
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/StreamInnerStateRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/StreamInnerStateRuntime.java
index 232b2018e3..aae8901b0b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/StreamInnerStateRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/runtime/StreamInnerStateRuntime.java
@@ -20,8 +20,6 @@
 import io.siddhi.core.query.input.stream.single.SingleStreamRuntime;
 import io.siddhi.core.query.input.stream.state.PostStateProcessor;
 import io.siddhi.core.query.input.stream.state.PreStateProcessor;
-import io.siddhi.core.query.input.stream.state.StreamPostStateProcessor;
-import io.siddhi.core.query.input.stream.state.StreamPreStateProcessor;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 
@@ -79,9 +77,13 @@ public StateInputStream.Type getStateType() {
     }
 
     @Override
-    public void init() {
+    public void setup() {
         singleStreamRuntimeList.get(0).getProcessStreamReceiver().setNext(firstProcessor);
         singleStreamRuntimeList.get(0).getProcessStreamReceiver().addStatefulProcessor(firstProcessor);
+    }
+
+    @Override
+    public void init() {
         firstProcessor.init();
     }
 
@@ -95,31 +97,4 @@ public void update() {
         firstProcessor.updateState();
     }
 
-    @Override
-    public InnerStateRuntime clone(String key) {
-        StreamInnerStateRuntime streamInnerStateRuntime = new StreamInnerStateRuntime(stateType);
-        for (SingleStreamRuntime singleStreamRuntime : singleStreamRuntimeList) {
-            streamInnerStateRuntime.singleStreamRuntimeList.add((SingleStreamRuntime) singleStreamRuntime.clone(key));
-        }
-
-        Processor processor = streamInnerStateRuntime.singleStreamRuntimeList.get(0).getProcessorChain();
-        streamInnerStateRuntime.firstProcessor = (StreamPreStateProcessor) processor;
-
-        while (processor != null) {
-            if (processor instanceof StreamPostStateProcessor) {
-                streamInnerStateRuntime.lastProcessor = (StreamPostStateProcessor) processor;
-                break;
-            } else {
-                processor = processor.getNextProcessor();
-            }
-        }
-
-        ((StreamPostStateProcessor) streamInnerStateRuntime.lastProcessor).setThisStatePreProcessor(
-                (StreamPreStateProcessor) streamInnerStateRuntime.firstProcessor);
-        ((StreamPreStateProcessor) streamInnerStateRuntime.firstProcessor).setThisStatePostProcessor(
-                (StreamPostStateProcessor) streamInnerStateRuntime.lastProcessor);
-        ((StreamPreStateProcessor) streamInnerStateRuntime.firstProcessor).setThisLastProcessor(
-                (StreamPostStateProcessor) streamInnerStateRuntime.lastProcessor);
-        return streamInnerStateRuntime;
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoStreamCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoStreamCallback.java
index df5fd05d47..592fb08f7c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoStreamCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoStreamCallback.java
@@ -28,8 +28,8 @@
  * Siddhi queries and put them into {@link StreamJunction}.
  */
 public class InsertIntoStreamCallback extends OutputCallback {
-    private StreamDefinition outputStreamDefinition;
-    private StreamJunction.Publisher publisher;
+    protected StreamDefinition outputStreamDefinition;
+    protected StreamJunction.Publisher publisher;
 
     public InsertIntoStreamCallback(StreamDefinition outputStreamDefinition, String queryName) {
         super(queryName);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoStreamEndPartitionCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoStreamEndPartitionCallback.java
new file mode 100644
index 0000000000..452dafbdf6
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoStreamEndPartitionCallback.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package io.siddhi.core.query.output.callback;
+
+import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.debugger.SiddhiDebugger;
+import io.siddhi.core.event.ComplexEvent;
+import io.siddhi.core.event.ComplexEventChunk;
+import io.siddhi.core.stream.StreamJunction;
+import io.siddhi.query.api.definition.StreamDefinition;
+
+/**
+ * Implementation of {@link OutputCallback} to receive processed Siddhi events from partitioned
+ * Siddhi queries and put them into {@link StreamJunction}.
+ */
+public class InsertIntoStreamEndPartitionCallback extends InsertIntoStreamCallback {
+
+    public InsertIntoStreamEndPartitionCallback(StreamDefinition outputStreamDefinition, String queryName) {
+        super(outputStreamDefinition, queryName);
+    }
+
+    @Override
+    public void send(ComplexEventChunk complexEventChunk, int noOfEvents) {
+        if (getSiddhiDebugger() != null) {
+            getSiddhiDebugger()
+                    .checkBreakPoint(getQueryName(), SiddhiDebugger.QueryTerminal.OUT, complexEventChunk.getFirst());
+        }
+        complexEventChunk.reset();
+        if (complexEventChunk.getFirst() != null) {
+            String flowId = SiddhiAppContext.getPartitionFlowId();
+            SiddhiAppContext.stopPartitionFlow();
+            try {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent complexEvent = complexEventChunk.next();
+                    if (complexEvent.getType() == ComplexEvent.Type.EXPIRED) {
+                        complexEvent.setType(ComplexEvent.Type.CURRENT);
+                    }
+                }
+                publisher.send(complexEventChunk.getFirst());
+            } finally {
+                SiddhiAppContext.startPartitionFlow(flowId);
+            }
+        }
+    }
+
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoWindowCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoWindowCallback.java
index d5a19e5e5c..a00f637cb3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoWindowCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoWindowCallback.java
@@ -31,12 +31,12 @@ public class InsertIntoWindowCallback extends OutputCallback {
     /**
      * Window to which the events have to be inserted.
      */
-    private final Window window;
+    protected final Window window;
 
     /**
      * StreamDefinition of the window.
      */
-    private final StreamDefinition outputStreamDefinition;
+    protected final StreamDefinition outputStreamDefinition;
 
     public InsertIntoWindowCallback(Window window, StreamDefinition outputStreamDefinition, String queryName) {
         super(queryName);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoWindowEndPartitionCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoWindowEndPartitionCallback.java
new file mode 100644
index 0000000000..e1a562556c
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoWindowEndPartitionCallback.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.query.output.callback;
+
+import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.debugger.SiddhiDebugger;
+import io.siddhi.core.event.ComplexEvent;
+import io.siddhi.core.event.ComplexEventChunk;
+import io.siddhi.core.stream.StreamJunction;
+import io.siddhi.core.window.Window;
+import io.siddhi.query.api.definition.StreamDefinition;
+
+/**
+ * This callback is an adapter between {@link StreamJunction} and {@link Window}.
+ * It receives {@link ComplexEventChunk}s from partitioned queries and insert them into {@link Window}.
+ */
+public class InsertIntoWindowEndPartitionCallback extends InsertIntoWindowCallback {
+
+    public InsertIntoWindowEndPartitionCallback(Window window, StreamDefinition outputStreamDefinition,
+                                                String queryName) {
+        super(window, outputStreamDefinition, queryName);
+    }
+
+    /**
+     * Add the event into the {@link Window}
+     *
+     * @param complexEventChunk the event to add
+     * @param noOfEvents        number of events
+     */
+    @Override
+    public void send(ComplexEventChunk complexEventChunk, int noOfEvents) {
+        if (getSiddhiDebugger() != null) {
+            getSiddhiDebugger()
+                    .checkBreakPoint(getQueryName(), SiddhiDebugger.QueryTerminal.OUT, complexEventChunk.getFirst());
+        }
+        // If events are inserted directly from another window, expired events can arrive
+        complexEventChunk.reset();
+        if (complexEventChunk.getFirst() != null) {
+            String flowId = SiddhiAppContext.getCurrentFlowId();
+            SiddhiAppContext.stopPartitionFlow();
+            try {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent complexEvent = complexEventChunk.next();
+                    if (complexEvent.getType() == ComplexEvent.Type.EXPIRED) {
+                        complexEvent.setType(ComplexEvent.Type.CURRENT);
+                    }
+                }
+                window.add(complexEventChunk);
+            } finally {
+                SiddhiAppContext.startPartitionFlow(flowId);
+            }
+        }
+    }
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
index 28496d81da..25db12e1e1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
@@ -23,9 +23,11 @@
 import io.siddhi.core.query.input.MultiProcessStreamReceiver;
 import io.siddhi.core.query.output.callback.OutputCallback;
 import io.siddhi.core.query.output.callback.QueryCallback;
-import io.siddhi.core.util.extension.holder.EternalReferencedHolder;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 import io.siddhi.core.util.lock.LockWrapper;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.core.util.statistics.LatencyTracker;
 
 import java.util.ArrayList;
@@ -34,8 +36,10 @@
 /**
  * Abstract parent implementation of Output Rate Limiting. Output Rate Limiting is used to throttle the output of
  * Siddhi queries based on various criteria.
+ *
+ * @param <S> current state of the RateLimiter
  */
-public abstract class OutputRateLimiter implements EternalReferencedHolder, Snapshotable {
+public abstract class OutputRateLimiter<S extends State> implements ExternalReferencedHolder {
 
     protected List<QueryCallback> queryCallbacks = new ArrayList<QueryCallback>();
     protected OutputCallback outputCallback = null;
@@ -43,21 +47,18 @@ public abstract class OutputRateLimiter implements EternalReferencedHolder, Snap
     protected SiddhiQueryContext siddhiQueryContext;
     protected LockWrapper lockWrapper;
     private boolean hasCallBack = false;
-    private String elementId;
+    protected StateHolder<S> stateHolder;
 
-    public void init(LockWrapper lockWrapper, SiddhiQueryContext siddhiQueryContext) {
+    public void init(LockWrapper lockWrapper, boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
         this.siddhiQueryContext = siddhiQueryContext;
         if (outputCallback != null) {
             this.lockWrapper = lockWrapper;
         }
-        if (elementId == null) {
-            elementId = "OutputRateLimiter-" +
-                    siddhiQueryContext.getSiddhiAppContext().getElementIdGenerator().createNewId();
-        }
-        siddhiQueryContext.getSiddhiAppContext().getSnapshotService().addSnapshotable(
-                siddhiQueryContext.getName(), this);
+        stateHolder = siddhiQueryContext.generateStateHolder(this.getClass().getName(), groupBy, init());
     }
 
+    protected abstract StateFactory<S> init();
+
     public void sendToCallBacks(ComplexEventChunk complexEventChunk) {
         MultiProcessStreamReceiver.ReturnEventHolder returnEventHolder =
                 MultiProcessStreamReceiver.getMultiProcessReturn().get();
@@ -121,20 +122,9 @@ public boolean hasCallBack() {
         return hasCallBack;
     }
 
-    public abstract OutputRateLimiter clone(String key);
-
-    public String getElementId() {
-        return elementId;
-    }
-
     public void setLatencyTracker(LatencyTracker latencyTracker) {
         this.latencyTracker = latencyTracker;
     }
 
-    @Override
-    public void clean() {
-        siddhiQueryContext.getSiddhiAppContext().getSnapshotService().removeSnapshotable(
-                siddhiQueryContext.getName(), this);
-    }
 }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
index 78825e2898..bdc6aa7604 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
@@ -19,10 +19,9 @@
 
 
 import io.siddhi.core.event.ComplexEventChunk;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
-
 /**
  * Implementation of {@link OutputRateLimiter} which will pass through events without doing any rate limiting. This
  * is the default rate limiting strategy used by Siddhi.
@@ -41,6 +40,11 @@ public PassThroughOutputRateLimiter clone(String key) {
         return instance;
     }
 
+    @Override
+    protected StateFactory init() {
+        return null;
+    }
+
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         sendToCallBacks(complexEventChunk);
@@ -55,15 +59,4 @@ public void start() {
     public void stop() {
         //Nothing to stop
     }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
index 1d921dd444..78c57b6740 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
@@ -21,6 +21,8 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,48 +32,47 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined number of events and the emit all
  * collected events as a batch.
  */
-public class AllPerEventOutputRateLimiter extends OutputRateLimiter {
+public class AllPerEventOutputRateLimiter extends OutputRateLimiter<AllPerEventOutputRateLimiter.RateLimiterState> {
 
     private final Integer value;
-    private String id;
 
-    private volatile int counter = 0;
-    private ComplexEventChunk<ComplexEvent> allComplexEventChunk;
 
     public AllPerEventOutputRateLimiter(String id, Integer value) {
-        this.id = id;
         this.value = value;
-        allComplexEventChunk = new ComplexEventChunk<ComplexEvent>(false);
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        AllPerEventOutputRateLimiter instance = new AllPerEventOutputRateLimiter(id + key, value);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
+
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
-                    complexEventChunk.remove();
-                    allComplexEventChunk.add(event);
-                    counter++;
-                    if (counter == value) {
-                        ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
-                                (complexEventChunk.isBatch());
-                        outputEventChunk.add(allComplexEventChunk.getFirst());
-                        allComplexEventChunk.clear();
-                        counter = 0;
-                        outputEventChunks.add(outputEventChunk);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
+                        complexEventChunk.remove();
+                        state.allComplexEventChunk.add(event);
+                        state.counter++;
+                        if (state.counter == value) {
+                            ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
+                                    (complexEventChunk.isBatch());
+                            outputEventChunk.add(state.allComplexEventChunk.getFirst());
+                            state.allComplexEventChunk.clear();
+                            state.counter = 0;
+                            outputEventChunks.add(outputEventChunk);
+                        }
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -88,19 +89,30 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("Counter", counter);
-        state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
-        return state;
-    }
+    class RateLimiterState extends State {
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        allComplexEventChunk.clear();
-        allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
-        counter = (int) state.get("Counter");
+        private volatile int counter = 0;
+        private ComplexEventChunk<ComplexEvent> allComplexEventChunk = new ComplexEventChunk<ComplexEvent>(false);
+
+        @Override
+        public boolean canDestroy() {
+            return counter == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Counter", counter);
+            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            allComplexEventChunk.clear();
+            allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
+            counter = (int) state.get("Counter");
+        }
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
index 64f0972cb3..896a09396b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
@@ -22,6 +22,8 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,57 +34,55 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined number of events and the emit only the
  * first event. This implementation specifically handle queries with group by.
  */
-public class FirstGroupByPerEventOutputRateLimiter extends OutputRateLimiter {
+public class FirstGroupByPerEventOutputRateLimiter
+        extends OutputRateLimiter<FirstGroupByPerEventOutputRateLimiter.RateLimiterState> {
     private final Integer value;
-    private List<String> groupByKeys = new ArrayList<String>();
-    private String id;
-    private ComplexEventChunk<ComplexEvent> allComplexEventChunk;
-    private volatile int counter = 0;
 
     public FirstGroupByPerEventOutputRateLimiter(String id, Integer value) {
-        this.id = id;
         this.value = value;
-        allComplexEventChunk = new ComplexEventChunk<ComplexEvent>(false);
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        FirstGroupByPerEventOutputRateLimiter instance = new FirstGroupByPerEventOutputRateLimiter(id + key, value);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
-                    complexEventChunk.remove();
-                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                    if (!groupByKeys.contains(groupedComplexEvent.getGroupKey())) {
-                        groupByKeys.add(groupedComplexEvent.getGroupKey());
-                        allComplexEventChunk.add(groupedComplexEvent.getComplexEvent());
-                    }
-                    if (++counter == value) {
-                        if (allComplexEventChunk.getFirst() != null) {
-                            ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
-                                    (complexEventChunk.isBatch());
-                            outputEventChunk.add(allComplexEventChunk.getFirst());
-                            outputEventChunks.add(outputEventChunk);
-                            allComplexEventChunk.clear();
-                            counter = 0;
-                            groupByKeys.clear();
-                        } else {
-                            counter = 0;
-                            groupByKeys.clear();
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
+                        complexEventChunk.remove();
+                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                        if (!state.groupByKeys.contains(groupedComplexEvent.getGroupKey())) {
+                            state.groupByKeys.add(groupedComplexEvent.getGroupKey());
+                            state.allComplexEventChunk.add(groupedComplexEvent.getComplexEvent());
                         }
+                        if (++state.counter == value) {
+                            if (state.allComplexEventChunk.getFirst() != null) {
+                                ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
+                                        (complexEventChunk.isBatch());
+                                outputEventChunk.add(state.allComplexEventChunk.getFirst());
+                                outputEventChunks.add(outputEventChunk);
+                                state.allComplexEventChunk.clear();
+                                state.counter = 0;
+                                state.groupByKeys.clear();
+                            } else {
+                                state.counter = 0;
+                                state.groupByKeys.clear();
+                            }
 
+                        }
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -99,24 +99,36 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("Counter", counter);
-            state.put("GroupByKeys", groupByKeys);
-            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+    class RateLimiterState extends State {
+        private List<String> groupByKeys = new ArrayList<String>();
+        private ComplexEventChunk<ComplexEvent> allComplexEventChunk = new ComplexEventChunk<ComplexEvent>(false);
+
+        private volatile int counter = 0;
+
+        @Override
+        public boolean canDestroy() {
+            return counter == 0 && groupByKeys.isEmpty();
         }
-        return state;
-    }
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        synchronized (this) {
-            counter = (int) state.get("Counter");
-            groupByKeys = (List<String>) state.get("GroupByKeys");
-            allComplexEventChunk.clear();
-            allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("Counter", counter);
+                state.put("GroupByKeys", groupByKeys);
+                state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            synchronized (this) {
+                counter = (int) state.get("Counter");
+                groupByKeys = (List<String>) state.get("GroupByKeys");
+                allComplexEventChunk.clear();
+                allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
+            }
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
index fe71c7d12d..e731096ba7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
@@ -21,6 +21,8 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,44 +32,45 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined number of events and the emit only the
  * first event.
  */
-public class FirstPerEventOutputRateLimiter extends OutputRateLimiter {
+public class FirstPerEventOutputRateLimiter
+        extends OutputRateLimiter<FirstPerEventOutputRateLimiter.RateLimiterState> {
     private final Integer value;
-    private String id;
-    private volatile int counter = 0;
 
     public FirstPerEventOutputRateLimiter(String id, Integer value) {
         this.value = value;
-        this.id = id;
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        FirstPerEventOutputRateLimiter instance = new FirstPerEventOutputRateLimiter(id + key, value);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
-        synchronized (this) {
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
             while (complexEventChunk.hasNext()) {
                 ComplexEvent event = complexEventChunk.next();
                 if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
-                    if (counter == 0) {
+                    if (state.counter == 0) {
                         complexEventChunk.remove();
                         ComplexEventChunk<ComplexEvent> firstPerEventChunk = new ComplexEventChunk<ComplexEvent>
                                 (complexEventChunk.isBatch());
                         firstPerEventChunk.add(event);
                         outputEventChunks.add(firstPerEventChunk);
                     }
-                    if (++counter == value) {
-                        counter = 0;
+                    if (++state.counter == value) {
+                        state.counter = 0;
                     }
                 }
             }
         }
+        } finally {
+            stateHolder.returnState(state);
+        }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
         }
@@ -84,16 +87,25 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("Counter", counter);
-        return state;
-    }
+    class RateLimiterState extends State {
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        counter = (int) state.get("Counter");
-    }
+        private volatile int counter = 0;
 
+        @Override
+        public boolean canDestroy() {
+            return counter == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Counter", counter);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            counter = (int) state.get("Counter");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
index 0c117f02bf..e6152dadcc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
@@ -23,6 +23,8 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,50 +35,51 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined number of events and the emit only the
  * last event. This implementation specifically handle queries with group by.
  */
-public class LastGroupByPerEventOutputRateLimiter extends OutputRateLimiter {
+public class LastGroupByPerEventOutputRateLimiter extends
+        OutputRateLimiter<LastGroupByPerEventOutputRateLimiter.RateLimiterState> {
     private final Integer value;
-    private String id;
-    private volatile int counter = 0;
-    private Map<String, ComplexEvent> allGroupByKeyEvents = new LinkedHashMap<String, ComplexEvent>();
 
     public LastGroupByPerEventOutputRateLimiter(String id, Integer value) {
-        this.id = id;
         this.value = value;
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        LastGroupByPerEventOutputRateLimiter instance = new LastGroupByPerEventOutputRateLimiter(id + key, value);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
-                    complexEventChunk.remove();
-                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                    allGroupByKeyEvents.put(groupedComplexEvent.getGroupKey(), groupedComplexEvent.getComplexEvent());
-                    if (++counter == value) {
-                        counter = 0;
-                        if (allGroupByKeyEvents.size() != 0) {
-                            ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
-                                    (complexEventChunk.isBatch());
-
-                            for (ComplexEvent complexEvent : allGroupByKeyEvents.values()) {
-                                outputEventChunk.add(complexEvent);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
+                        complexEventChunk.remove();
+                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                        state.allGroupByKeyEvents.put(groupedComplexEvent.getGroupKey(),
+                                groupedComplexEvent.getComplexEvent());
+                        if (++state.counter == value) {
+                            state.counter = 0;
+                            if (state.allGroupByKeyEvents.size() != 0) {
+                                ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
+                                        (complexEventChunk.isBatch());
+
+                                for (ComplexEvent complexEvent : state.allGroupByKeyEvents.values()) {
+                                    outputEventChunk.add(complexEvent);
+                                }
+                                state.allGroupByKeyEvents.clear();
+                                outputEventChunks.add(outputEventChunk);
                             }
-                            allGroupByKeyEvents.clear();
-                            outputEventChunks.add(outputEventChunk);
                         }
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -93,19 +96,30 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("Counter", counter);
-            state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
+    class RateLimiterState extends State {
+
+        private volatile int counter = 0;
+        private Map<String, ComplexEvent> allGroupByKeyEvents = new LinkedHashMap<String, ComplexEvent>();
+
+        @Override
+        public boolean canDestroy() {
+            return counter == 0 && allGroupByKeyEvents.isEmpty();
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        counter = (int) state.get("Counter");
-        allGroupByKeyEvents = (Map<String, ComplexEvent>) state.get("AllGroupByKeyEvents");
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("Counter", counter);
+                state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            counter = (int) state.get("Counter");
+            allGroupByKeyEvents = (Map<String, ComplexEvent>) state.get("AllGroupByKeyEvents");
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastPerEventOutputRateLimiter.java
index f57ba1f817..d391f7c467 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastPerEventOutputRateLimiter.java
@@ -21,6 +21,8 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,41 +32,41 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined number of events and the emit only the
  * last event.
  */
-public class LastPerEventOutputRateLimiter extends OutputRateLimiter {
+public class LastPerEventOutputRateLimiter extends OutputRateLimiter<LastPerEventOutputRateLimiter.RateLimiterState> {
     private final Integer value;
-    private String id;
-    private volatile int counter = 0;
 
     public LastPerEventOutputRateLimiter(String id, Integer value) {
-        this.id = id;
         this.value = value;
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        LastPerEventOutputRateLimiter instance = new LastPerEventOutputRateLimiter(id + key, value);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
-                    if (++counter == value) {
-                        complexEventChunk.remove();
-                        ComplexEventChunk<ComplexEvent> lastPerEventChunk = new ComplexEventChunk<ComplexEvent>
-                                (complexEventChunk.isBatch());
-                        lastPerEventChunk.add(event);
-                        counter = 0;
-                        outputEventChunks.add(lastPerEventChunk);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
+                        if (++state.counter == value) {
+                            complexEventChunk.remove();
+                            ComplexEventChunk<ComplexEvent> lastPerEventChunk = new ComplexEventChunk<ComplexEvent>
+                                    (complexEventChunk.isBatch());
+                            lastPerEventChunk.add(event);
+                            state.counter = 0;
+                            outputEventChunks.add(lastPerEventChunk);
+                        }
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -81,16 +83,27 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("Counter", counter);
-        return state;
-    }
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        counter = (int) state.get("Counter");
+    class RateLimiterState extends State {
+
+        private volatile int counter = 0;
+
+        @Override
+        public boolean canDestroy() {
+            return counter == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Counter", counter);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            counter = (int) state.get("Counter");
+        }
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index 2da599b077..3d65e99577 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -22,6 +22,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,99 +32,109 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link PerSnapshotOutputRateLimiter} for queries with GroupBy, Aggregators and Windows.
  */
 public class AggregationGroupByWindowedPerSnapshotOutputRateLimiter extends
         AggregationWindowedPerSnapshotOutputRateLimiter {
-    private List<GroupedComplexEvent> eventList;
-    private Map<String, Map<Integer, Object>> groupByAggregateAttributeValueMap;
 
-    protected AggregationGroupByWindowedPerSnapshotOutputRateLimiter(String id, Long value,
-                                                                     ScheduledExecutorService scheduledExecutorService,
+    protected AggregationGroupByWindowedPerSnapshotOutputRateLimiter(Long value,
                                                                      List<Integer> aggregateAttributePositionList,
                                                                      WrappedSnapshotOutputRateLimiter
                                                                              wrappedSnapshotOutputRateLimiter,
+                                                                     boolean groupBy,
                                                                      SiddhiQueryContext siddhiQueryContext) {
-        super(id, value, scheduledExecutorService, aggregateAttributePositionList, wrappedSnapshotOutputRateLimiter,
-                siddhiQueryContext);
-        groupByAggregateAttributeValueMap = new HashMap<String, Map<Integer, Object>>();
-        eventList = new LinkedList<GroupedComplexEvent>();
+        super(value, aggregateAttributePositionList, wrappedSnapshotOutputRateLimiter,
+                groupBy, siddhiQueryContext);
+    }
+
+    @Override
+    protected StateFactory<AggregationRateLimiterState> init() {
+        return () -> new AggregationGroupByRateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
         List<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
-        synchronized (this) {
-            complexEventChunk.reset();
-            String currentGroupByKey = null;
-            Map<Integer, Object> currentAggregateAttributeValueMap = null;
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event);
-                } else {
-                    complexEventChunk.remove();
-                    tryFlushEvents(outputEventChunks, event);
-                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                    if (currentGroupByKey == null || !currentGroupByKey.equals(groupedComplexEvent.getGroupKey())) {
-                        currentGroupByKey = groupedComplexEvent.getGroupKey();
-                        currentAggregateAttributeValueMap = groupByAggregateAttributeValueMap.get(currentGroupByKey);
-                        if (currentAggregateAttributeValueMap == null) {
-                            currentAggregateAttributeValueMap = new HashMap<Integer, Object>
-                                    (aggregateAttributePositionList.size());
-                            groupByAggregateAttributeValueMap.put(currentGroupByKey, currentAggregateAttributeValueMap);
-                        }
-                    }
-                    if (groupedComplexEvent.getType() == ComplexEvent.Type.CURRENT) {
-                        eventList.add(groupedComplexEvent);
-                        for (Integer position : aggregateAttributePositionList) {
-                            currentAggregateAttributeValueMap.put(position, event.getOutputData()[position]);
+        AggregationGroupByRateLimiterState state = (AggregationGroupByRateLimiterState) stateHolder.getState();
+        try {
+            synchronized (state) {
+                complexEventChunk.reset();
+                String currentGroupByKey = null;
+                Map<Integer, Object> currentAggregateAttributeValueMap = null;
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        tryFlushEvents(outputEventChunks, event, state);
+                    } else {
+                        complexEventChunk.remove();
+                        tryFlushEvents(outputEventChunks, event, state);
+                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                        if (currentGroupByKey == null || !currentGroupByKey.equals(groupedComplexEvent.getGroupKey())) {
+                            currentGroupByKey = groupedComplexEvent.getGroupKey();
+                            currentAggregateAttributeValueMap =
+                                    state.groupByAggregateAttributeValueMap.get(currentGroupByKey);
+                            if (currentAggregateAttributeValueMap == null) {
+                                currentAggregateAttributeValueMap = new HashMap<Integer, Object>
+                                        (aggregateAttributePositionList.size());
+                                state.groupByAggregateAttributeValueMap.put(currentGroupByKey,
+                                        currentAggregateAttributeValueMap);
+                            }
                         }
-                    } else if (groupedComplexEvent.getType() == ComplexEvent.Type.EXPIRED) {
-                        for (Iterator<GroupedComplexEvent> iterator = eventList.iterator(); iterator.hasNext(); ) {
-                            GroupedComplexEvent currentEvent = iterator.next();
-                            if (comparator.compare(currentEvent.getComplexEvent(), groupedComplexEvent
-                                    .getComplexEvent()) == 0) {
-                                iterator.remove();
-                                for (Integer position : aggregateAttributePositionList) {
-                                    currentAggregateAttributeValueMap.put(position,
-                                            groupedComplexEvent.getOutputData()[position]);
+                        if (groupedComplexEvent.getType() == ComplexEvent.Type.CURRENT) {
+                            state.eventList.add(groupedComplexEvent);
+                            for (Integer position : aggregateAttributePositionList) {
+                                currentAggregateAttributeValueMap.put(position, event.getOutputData()[position]);
+                            }
+                        } else if (groupedComplexEvent.getType() == ComplexEvent.Type.EXPIRED) {
+                            for (Iterator<GroupedComplexEvent> iterator = state.eventList.iterator();
+                                 iterator.hasNext(); ) {
+                                GroupedComplexEvent currentEvent = iterator.next();
+                                if (comparator.compare(currentEvent.getComplexEvent(), groupedComplexEvent
+                                        .getComplexEvent()) == 0) {
+                                    iterator.remove();
+                                    for (Integer position : aggregateAttributePositionList) {
+                                        currentAggregateAttributeValueMap.put(position,
+                                                groupedComplexEvent.getOutputData()[position]);
+                                    }
+                                    break;
                                 }
-                                break;
                             }
+                        } else if (groupedComplexEvent.getType() == ComplexEvent.Type.RESET) {
+                            state.eventList.clear();
+                            state.groupByAggregateAttributeValueMap.clear();
                         }
-                    } else if (groupedComplexEvent.getType() == ComplexEvent.Type.RESET) {
-                        eventList.clear();
-                        groupByAggregateAttributeValueMap.clear();
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
         }
     }
 
-    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event) {
+    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
+                                AggregationGroupByRateLimiterState state) {
         if (event.getTimestamp() >= scheduledTime) {
-            constructOutputChunk(outputEventChunks);
+            constructOutputChunk(outputEventChunks, state);
             scheduledTime = scheduledTime + value;
             scheduler.notifyAt(scheduledTime);
         }
     }
 
-    private void constructOutputChunk(List<ComplexEventChunk<ComplexEvent>> outputEventChunks) {
+    private void constructOutputChunk(List<ComplexEventChunk<ComplexEvent>> outputEventChunks,
+                                      AggregationGroupByRateLimiterState state) {
         ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
         Set<String> outputGroupingKeys = new HashSet<>();
-        for (GroupedComplexEvent originalComplexEvent : eventList) {
+        for (GroupedComplexEvent originalComplexEvent : state.eventList) {
             String currentGroupByKey = originalComplexEvent.getGroupKey();
             if (!outputGroupingKeys.contains(currentGroupByKey)) {
                 outputGroupingKeys.add(currentGroupByKey);
-                Map<Integer, Object> currentAggregateAttributeValueMap = groupByAggregateAttributeValueMap.get
+                Map<Integer, Object> currentAggregateAttributeValueMap = state.groupByAggregateAttributeValueMap.get
                         (currentGroupByKey);
                 ComplexEvent eventCopy = cloneComplexEvent(originalComplexEvent.getComplexEvent());
                 for (Integer position : aggregateAttributePositionList) {
@@ -135,29 +146,37 @@ private void constructOutputChunk(List<ComplexEventChunk<ComplexEvent>> outputEv
         outputEventChunks.add(outputEventChunk);
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("EventList", eventList);
-            state.put("GroupByAggregateAttributeValueMap", groupByAggregateAttributeValueMap);
+
+    class AggregationGroupByRateLimiterState extends AggregationRateLimiterState {
+
+        private List<GroupedComplexEvent> eventList;
+        private Map<String, Map<Integer, Object>> groupByAggregateAttributeValueMap;
+
+        public AggregationGroupByRateLimiterState() {
+            groupByAggregateAttributeValueMap = new HashMap<String, Map<Integer, Object>>();
+            eventList = new LinkedList<GroupedComplexEvent>();
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        eventList = (List<GroupedComplexEvent>) state.get("EventList");
-        groupByAggregateAttributeValueMap = (Map<String, Map<Integer, Object>>) state.get
-                ("GroupByAggregateAttributeValueMap");
-    }
+        @Override
+        public boolean canDestroy() {
+            return groupByAggregateAttributeValueMap.isEmpty() && eventList.isEmpty();
+        }
 
-    @Override
-    public SnapshotOutputRateLimiter clone(String key, WrappedSnapshotOutputRateLimiter
-            wrappedSnapshotOutputRateLimiter) {
-        return new AggregationGroupByWindowedPerSnapshotOutputRateLimiter(id + key, value, scheduledExecutorService,
-                aggregateAttributePositionList,
-                wrappedSnapshotOutputRateLimiter,
-                siddhiQueryContext);
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("EventList", eventList);
+                state.put("GroupByAggregateAttributeValueMap", groupByAggregateAttributeValueMap);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            eventList = (List<GroupedComplexEvent>) state.get("EventList");
+            groupByAggregateAttributeValueMap = (Map<String, Map<Integer, Object>>) state.get
+                    ("GroupByAggregateAttributeValueMap");
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
index b423ec3b3e..3010fc86a8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
@@ -24,6 +24,8 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,36 +35,29 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link PerSnapshotOutputRateLimiter} for queries with Windows and Aggregators.
  */
-public class AggregationWindowedPerSnapshotOutputRateLimiter extends SnapshotOutputRateLimiter {
+public class AggregationWindowedPerSnapshotOutputRateLimiter
+        extends SnapshotOutputRateLimiter
+        <AggregationWindowedPerSnapshotOutputRateLimiter.AggregationRateLimiterState> {
     protected final Long value;
-    protected final ScheduledExecutorService scheduledExecutorService;
-    protected String id;
     protected Comparator<ComplexEvent> comparator;
     protected List<Integer> aggregateAttributePositionList;
     protected Scheduler scheduler;
     protected long scheduledTime;
-    private List<ComplexEvent> eventList;
-    private Map<Integer, Object> aggregateAttributeValueMap;
 
-    protected AggregationWindowedPerSnapshotOutputRateLimiter(String id, Long value,
-                                                              ScheduledExecutorService scheduledExecutorService,
+
+    protected AggregationWindowedPerSnapshotOutputRateLimiter(Long value,
                                                               final List<Integer> aggregateAttributePositionList,
                                                               WrappedSnapshotOutputRateLimiter
                                                                       wrappedSnapshotOutputRateLimiter,
-                                                              SiddhiQueryContext siddhiQueryContext) {
-        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-        this.id = id;
+                                                              boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
+        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext, groupBy);
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
-        this.eventList = new LinkedList<ComplexEvent>();
         this.aggregateAttributePositionList = aggregateAttributePositionList;
         Collections.sort(aggregateAttributePositionList);
-        aggregateAttributeValueMap = new HashMap<Integer, Object>(aggregateAttributePositionList.size());
         this.comparator = new Comparator<ComplexEvent>() {
             Integer[] aggregateAttributePositions = aggregateAttributePositionList.toArray(new
                     Integer[aggregateAttributePositionList.size()]);
@@ -93,53 +88,64 @@ public int compare(ComplexEvent event1, ComplexEvent event2) {
         };
     }
 
+    @Override
+    protected StateFactory<AggregationRateLimiterState> init() {
+        return () -> new AggregationRateLimiterState();
+    }
+
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
-        synchronized (this) {
+        AggregationRateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
             while (complexEventChunk.hasNext()) {
                 ComplexEvent event = complexEventChunk.next();
                 if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event);
+                    tryFlushEvents(outputEventChunks, event, state);
                 } else {
                     complexEventChunk.remove();
-                    tryFlushEvents(outputEventChunks, event);
+                    tryFlushEvents(outputEventChunks, event, state);
                     if (event.getType() == ComplexEvent.Type.CURRENT) {
-                        eventList.add(event);
+                        state.eventList.add(event);
                         for (Integer position : aggregateAttributePositionList) {
-                            aggregateAttributeValueMap.put(position, event.getOutputData()[position]);
+                            state.aggregateAttributeValueMap.put(position, event.getOutputData()[position]);
                         }
                     } else if (event.getType() == ComplexEvent.Type.EXPIRED) {
-                        for (Iterator<ComplexEvent> iterator = eventList.iterator(); iterator.hasNext(); ) {
+                        for (Iterator<ComplexEvent> iterator = state.eventList.iterator(); iterator.hasNext(); ) {
                             ComplexEvent complexEvent = iterator.next();
                             if (comparator.compare(event, complexEvent) == 0) {
                                 iterator.remove();
                                 for (Integer position : aggregateAttributePositionList) {
-                                    aggregateAttributeValueMap.put(position, event.getOutputData()[position]);
+                                    state.aggregateAttributeValueMap.put(position, event.getOutputData()[position]);
                                 }
                                 break;
                             }
                         }
                     } else if (event.getType() == ComplexEvent.Type.RESET) {
-                        eventList.clear();
-                        aggregateAttributeValueMap.clear();
+                        state.eventList.clear();
+                        state.aggregateAttributeValueMap.clear();
                     }
                 }
             }
         }
+        } finally {
+            stateHolder.returnState(state);
+        }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
         }
     }
 
-    private void tryFlushEvents(ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event) {
+    private void tryFlushEvents(ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
+                                AggregationRateLimiterState state) {
         if (event.getTimestamp() >= scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
-            for (ComplexEvent originalComplexEvent : eventList) {
+            for (ComplexEvent originalComplexEvent : state.eventList) {
                 ComplexEvent eventCopy = cloneComplexEvent(originalComplexEvent);
                 for (Integer position : aggregateAttributePositionList) {
-                    eventCopy.getOutputData()[position] = aggregateAttributeValueMap.get(position);
+                    eventCopy.getOutputData()[position] = state.aggregateAttributeValueMap.get(position);
                 }
                 outputEventChunk.add(eventCopy);
             }
@@ -151,7 +157,7 @@ private void tryFlushEvents(ArrayList<ComplexEventChunk<ComplexEvent>> outputEve
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -164,28 +170,35 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("EventList", eventList);
-            state.put("AggregateAttributeValueMap", aggregateAttributeValueMap);
-        }
-        return state;
-    }
+    class AggregationRateLimiterState extends State {
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        eventList = (List<ComplexEvent>) state.get("EventList");
-        aggregateAttributeValueMap = (Map<Integer, Object>) state.get("AdgregateAttributeValueMap");
-    }
+        private List<ComplexEvent> eventList;
+        private Map<Integer, Object> aggregateAttributeValueMap;
 
-    @Override
-    public SnapshotOutputRateLimiter clone(String key, WrappedSnapshotOutputRateLimiter
-            wrappedSnapshotOutputRateLimiter) {
-        return new AggregationWindowedPerSnapshotOutputRateLimiter(id + key, value, scheduledExecutorService,
-                aggregateAttributePositionList, wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-    }
+        public AggregationRateLimiterState() {
+            this.eventList = new LinkedList<ComplexEvent>();
+            aggregateAttributeValueMap = new HashMap<Integer, Object>(aggregateAttributePositionList.size());
+        }
 
+        @Override
+        public boolean canDestroy() {
+            return aggregateAttributeValueMap.isEmpty() && eventList.isEmpty();
+        }
 
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("EventList", eventList);
+                state.put("AggregateAttributeValueMap", aggregateAttributeValueMap);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            eventList = (List<ComplexEvent>) state.get("EventList");
+            aggregateAttributeValueMap = (Map<Integer, Object>) state.get("AdgregateAttributeValueMap");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index 5d8f2bd74e..3f1dca1a47 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -26,6 +26,8 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,76 +35,75 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link PerSnapshotOutputRateLimiter} for queries with GroupBy, Aggregators and Windows which
  * will output all events.
  */
-public class AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter extends SnapshotOutputRateLimiter {
+public class AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter
+        extends SnapshotOutputRateLimiter<AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
-    private final ScheduledExecutorService scheduledExecutorService;
-    private String id;
-    private Map<String, LastEventHolder> groupByKeyEvents = new LinkedHashMap<String, LastEventHolder>();
     private Scheduler scheduler;
     private long scheduledTime;
 
-    public AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter(String id, Long value,
-                                                                     ScheduledExecutorService scheduledExecutorService,
+    public AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter(Long value,
                                                                      WrappedSnapshotOutputRateLimiter
                                                                              wrappedSnapshotOutputRateLimiter,
+                                                                     boolean groupBy,
                                                                      SiddhiQueryContext siddhiQueryContext) {
-        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-        this.id = id;
+        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext, groupBy);
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
     }
 
     @Override
-    public SnapshotOutputRateLimiter clone(String key, WrappedSnapshotOutputRateLimiter
-            wrappedSnapshotOutputRateLimiter) {
-        return new AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter(id + key, value,
-                scheduledExecutorService, wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         List<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event);
-                } else {
-                    complexEventChunk.remove();
-                    tryFlushEvents(outputEventChunks, event);
-                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                    LastEventHolder lastEventHolder = groupByKeyEvents.get(groupedComplexEvent.getGroupKey());
-                    if (lastEventHolder == null) {
-                        lastEventHolder = new LastEventHolder();
-                        groupByKeyEvents.put(groupedComplexEvent.getGroupKey(), lastEventHolder);
-                    }
-                    if (groupedComplexEvent.getType() == ComplexEvent.Type.CURRENT) {
-                        lastEventHolder.addLastInEvent(groupedComplexEvent.getComplexEvent());
-                    } else if (groupedComplexEvent.getType() == ComplexEvent.Type.EXPIRED) {
-                        lastEventHolder.removeLastInEvent(groupedComplexEvent.getComplexEvent());
-                    } else if (groupedComplexEvent.getType() == ComplexEvent.Type.RESET) {
-                        groupByKeyEvents.clear();
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        tryFlushEvents(outputEventChunks, event, state);
+                    } else {
+                        complexEventChunk.remove();
+                        tryFlushEvents(outputEventChunks, event, state);
+                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                        LastEventHolder lastEventHolder = state.groupByKeyEvents.get(groupedComplexEvent.getGroupKey());
+                        if (lastEventHolder == null) {
+                            lastEventHolder = new LastEventHolder();
+                            state.groupByKeyEvents.put(groupedComplexEvent.getGroupKey(), lastEventHolder);
+                        }
+                        if (groupedComplexEvent.getType() == ComplexEvent.Type.CURRENT) {
+                            lastEventHolder.addLastInEvent(groupedComplexEvent.getComplexEvent());
+                        } else if (groupedComplexEvent.getType() == ComplexEvent.Type.EXPIRED) {
+                            lastEventHolder.removeLastInEvent(groupedComplexEvent.getComplexEvent());
+                        } else if (groupedComplexEvent.getType() == ComplexEvent.Type.RESET) {
+                            state.groupByKeyEvents.clear();
+                        }
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
         }
-
     }
 
-    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event) {
+
+    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
+                                RateLimiterState state) {
         if (event.getTimestamp() >= scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
-            for (Iterator<Map.Entry<String, LastEventHolder>> iterator = groupByKeyEvents.entrySet().iterator();
+            for (Iterator<Map.Entry<String, LastEventHolder>> iterator = state.groupByKeyEvents.entrySet().iterator();
                  iterator.hasNext(); ) {
                 Map.Entry<String, LastEventHolder> lastEventHolderEntry = iterator.next();
 
@@ -122,7 +123,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -135,20 +136,6 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("GroupByKeyEvents", groupByKeyEvents);
-        }
-        return state;
-    }
-
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        groupByKeyEvents = (Map<String, LastEventHolder>) state.get("GroupByKeyEvents");
-    }
-
     private class LastEventHolder {
         long count = 0;
         ComplexEvent lastEvent = null;
@@ -169,4 +156,27 @@ public void checkAndClearLastInEvent() {
             }
         }
     }
+
+    class RateLimiterState extends State {
+        private Map<String, LastEventHolder> groupByKeyEvents = new LinkedHashMap<String, LastEventHolder>();
+
+        @Override
+        public boolean canDestroy() {
+            return groupByKeyEvents.isEmpty();
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("GroupByKeyEvents", groupByKeyEvents);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            groupByKeyEvents = (Map<String, LastEventHolder>) state.get("GroupByKeyEvents");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
index 67764376b6..ad6e5aca66 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
@@ -24,63 +24,72 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link PerSnapshotOutputRateLimiter} for queries with Aggregators which will output all events.
  */
-public class AllAggregationPerSnapshotOutputRateLimiter extends SnapshotOutputRateLimiter {
+public class AllAggregationPerSnapshotOutputRateLimiter
+        extends SnapshotOutputRateLimiter<AllAggregationPerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
-    private final ScheduledExecutorService scheduledExecutorService;
-    private String id;
-    private ComplexEvent lastEvent = null;
     private Scheduler scheduler;
     private long scheduledTime;
 
-    public AllAggregationPerSnapshotOutputRateLimiter(String id, Long value, ScheduledExecutorService
-            scheduledExecutorService, WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
-                                                      SiddhiQueryContext siddhiQueryContext) {
-        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-        this.id = id;
+    public AllAggregationPerSnapshotOutputRateLimiter(Long value,
+                                                      WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
+                                                      boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
+        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext, groupBy);
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
+    }
+
+    @Override
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         List<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event);
-                } else {
-                    tryFlushEvents(outputEventChunks, event);
-                    if (event.getType() == ComplexEvent.Type.CURRENT) {
-                        complexEventChunk.remove();
-                        lastEvent = event;
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        tryFlushEvents(outputEventChunks, event, state);
                     } else {
-                        lastEvent = null;
+                        tryFlushEvents(outputEventChunks, event, state);
+                        if (event.getType() == ComplexEvent.Type.CURRENT) {
+                            complexEventChunk.remove();
+                            state.lastEvent = event;
+                        } else {
+                            state.lastEvent = null;
+                        }
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk<ComplexEvent> eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
         }
     }
 
-    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event) {
+
+    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
+                                RateLimiterState state) {
         if (event.getTimestamp() >= scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
-            if (lastEvent != null) {
-                outputEventChunk.add(cloneComplexEvent(lastEvent));
+            if (state.lastEvent != null) {
+                outputEventChunk.add(cloneComplexEvent(state.lastEvent));
             }
             outputEventChunks.add(outputEventChunk);
             scheduledTime += value;
@@ -88,17 +97,9 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
         }
     }
 
-    @Override
-    public SnapshotOutputRateLimiter clone(String key, WrappedSnapshotOutputRateLimiter
-            wrappedSnapshotOutputRateLimiter) {
-        return new AllAggregationPerSnapshotOutputRateLimiter(id + key, value, scheduledExecutorService,
-                wrappedSnapshotOutputRateLimiter,
-                siddhiQueryContext);
-    }
-
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -111,18 +112,26 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("LastEvent", lastEvent);
+    class RateLimiterState extends State {
+        private ComplexEvent lastEvent = null;
+
+        @Override
+        public boolean canDestroy() {
+            return lastEvent == null;
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        lastEvent = (ComplexEvent) state.get("LastEvent");
-    }
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("LastEvent", lastEvent);
+            }
+            return state;
+        }
 
+        @Override
+        public void restore(Map<String, Object> state) {
+            lastEvent = (ComplexEvent) state.get("LastEvent");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
index 7320205d7b..80e323b1dd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
@@ -25,33 +25,34 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link PerSnapshotOutputRateLimiter} for queries with GroupBy.
  */
-public class GroupByPerSnapshotOutputRateLimiter extends SnapshotOutputRateLimiter {
+public class GroupByPerSnapshotOutputRateLimiter
+        extends SnapshotOutputRateLimiter<GroupByPerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
-    private String id;
-    private ScheduledExecutorService scheduledExecutorService;
-    private Map<String, ComplexEvent> groupByKeyEvents = new LinkedHashMap<String, ComplexEvent>();
     private Scheduler scheduler;
     private long scheduledTime;
 
-    public GroupByPerSnapshotOutputRateLimiter(String id, Long value,
-                                               ScheduledExecutorService scheduledExecutorService,
+    public GroupByPerSnapshotOutputRateLimiter(Long value,
                                                WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
-                                               SiddhiQueryContext siddhiQueryContext) {
-        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-        this.id = id;
+                                               boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
+        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext, groupBy);
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
+    }
+
+    @Override
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     /**
@@ -63,29 +64,37 @@ public GroupByPerSnapshotOutputRateLimiter(String id, Long value,
     public void process(ComplexEventChunk complexEventChunk) {
         List<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
             complexEventChunk.reset();
             while (complexEventChunk.hasNext()) {
                 ComplexEvent event = complexEventChunk.next();
                 if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event);
+                    tryFlushEvents(outputEventChunks, event, state);
                 } else if (event.getType() == ComplexEvent.Type.CURRENT) {
                     complexEventChunk.remove();
-                    tryFlushEvents(outputEventChunks, event);
+                    tryFlushEvents(outputEventChunks, event, state);
                     GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                    groupByKeyEvents.put(groupedComplexEvent.getGroupKey(), groupedComplexEvent.getComplexEvent());
+                    state.groupByKeyEvents.put(groupedComplexEvent.getGroupKey(),
+                            groupedComplexEvent.getComplexEvent());
                 }
             }
         }
+        } finally {
+            stateHolder.returnState(state);
+        }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
         }
     }
 
-    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event) {
+
+    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
+                                RateLimiterState state) {
         if (event.getTimestamp() >= scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
-            for (ComplexEvent complexEvent : groupByKeyEvents.values()) {
+            for (ComplexEvent complexEvent : state.groupByKeyEvents.values()) {
                 outputEventChunk.add(cloneComplexEvent(complexEvent));
             }
             outputEventChunks.add(outputEventChunk);
@@ -96,7 +105,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -109,25 +118,27 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("GroupByKeyEvents", groupByKeyEvents);
+    class RateLimiterState extends State {
+        private Map<String, ComplexEvent> groupByKeyEvents = new LinkedHashMap<String, ComplexEvent>();
+
+        @Override
+        public boolean canDestroy() {
+            return groupByKeyEvents.isEmpty();
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        groupByKeyEvents = (Map<String, ComplexEvent>) state.get("groupByKeyEvents");
-    }
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("GroupByKeyEvents", groupByKeyEvents);
+            }
+            return state;
+        }
 
-    @Override
-    public SnapshotOutputRateLimiter clone(String key, WrappedSnapshotOutputRateLimiter
-            wrappedSnapshotOutputRateLimiter) {
-        return new GroupByPerSnapshotOutputRateLimiter(id + key, value, scheduledExecutorService,
-                wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-    }
+        @Override
+        public void restore(Map<String, Object> state) {
+            groupByKeyEvents = (Map<String, ComplexEvent>) state.get("groupByKeyEvents");
 
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
index 5df20c24bc..a5881b53ad 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
@@ -25,54 +25,60 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Parent implementation for per event periodic snapshot rate limiting. Multiple implementations of this will be
  * there to represent different queries. Snapshot rate limiting will only emit current events representing the
  * snapshot period.
  */
-public class PerSnapshotOutputRateLimiter extends SnapshotOutputRateLimiter {
+public class PerSnapshotOutputRateLimiter
+        extends SnapshotOutputRateLimiter<PerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
-    private String id;
-    private ScheduledExecutorService scheduledExecutorService;
-    private ComplexEventChunk<ComplexEvent> eventChunk = new ComplexEventChunk<ComplexEvent>(false);
     private ComplexEvent lastEvent;
     private Scheduler scheduler;
     private long scheduledTime;
 
-    public PerSnapshotOutputRateLimiter(String id, Long value, ScheduledExecutorService scheduledExecutorService,
+    public PerSnapshotOutputRateLimiter(Long value,
                                         WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
-                                        SiddhiQueryContext siddhiQueryContext) {
-        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-        this.id = id;
+                                        boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
+        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext, groupBy);
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
+    }
+
+    @Override
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         List<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event);
-                } else if (event.getType() == ComplexEvent.Type.CURRENT) {
-                    complexEventChunk.remove();
-                    tryFlushEvents(outputEventChunks, event);
-                    lastEvent = event;
-                } else {
-                    tryFlushEvents(outputEventChunks, event);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        tryFlushEvents(outputEventChunks, event);
+                    } else if (event.getType() == ComplexEvent.Type.CURRENT) {
+                        complexEventChunk.remove();
+                        tryFlushEvents(outputEventChunks, event);
+                        lastEvent = event;
+                    } else {
+                        tryFlushEvents(outputEventChunks, event);
+                    }
                 }
             }
-
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -91,16 +97,9 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
         }
     }
 
-    @Override
-    public SnapshotOutputRateLimiter clone(String key, WrappedSnapshotOutputRateLimiter
-            wrappedSnapshotOutputRateLimiter) {
-        return new PerSnapshotOutputRateLimiter(id + key, value, scheduledExecutorService,
-                wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-    }
-
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -113,19 +112,29 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("EventChunk", eventChunk.getFirst());
+    class RateLimiterState extends State {
+
+        private ComplexEventChunk<ComplexEvent> eventChunk = new ComplexEventChunk<ComplexEvent>(false);
+
+        @Override
+        public boolean canDestroy() {
+            return eventChunk.getFirst() == null;
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        eventChunk.clear();
-        eventChunk.add((ComplexEvent) state.get("EventList"));
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("EventChunk", eventChunk.getFirst());
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            eventChunk.clear();
+            eventChunk.add((ComplexEvent) state.get("EventList"));
+        }
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/SnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/SnapshotOutputRateLimiter.java
index 596205a2eb..37d3b460dc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/SnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/SnapshotOutputRateLimiter.java
@@ -28,16 +28,20 @@
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.lock.LockWrapper;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
-
 /**
  * Parent implementation to run the {@link Scheduler} to handle periodic snapshot rate
  * limiting.
+ *
+ * @param <S> current state of the RateLimiter
  */
-public abstract class SnapshotOutputRateLimiter implements Schedulable {
+public abstract class SnapshotOutputRateLimiter<S extends State> implements Schedulable {
     private static final Logger log = Logger.getLogger(SnapshotOutputRateLimiter.class);
+    protected final StateHolder<S> stateHolder;
     protected StreamEventCloner streamEventCloner;
     protected StateEventCloner stateEventCloner;
     protected SiddhiQueryContext siddhiQueryContext;
@@ -46,15 +50,15 @@ public abstract class SnapshotOutputRateLimiter implements Schedulable {
     private boolean receiveStreamEvent;
 
     protected SnapshotOutputRateLimiter(WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
-                                        SiddhiQueryContext siddhiQueryContext) {
+                                        SiddhiQueryContext siddhiQueryContext, boolean groupBy) {
         this.wrappedSnapshotOutputRateLimiter = wrappedSnapshotOutputRateLimiter;
         this.siddhiQueryContext = siddhiQueryContext;
+        stateHolder = siddhiQueryContext.generateStateHolder(this.getClass().getName(), groupBy, init());
     }
 
-    public abstract void process(ComplexEventChunk complexEventChunk);
+    protected abstract StateFactory<S> init();
 
-    public abstract SnapshotOutputRateLimiter clone(String key, WrappedSnapshotOutputRateLimiter
-            wrappedSnapshotOutputRateLimiter);
+    public abstract void process(ComplexEventChunk complexEventChunk);
 
     public void setStreamEventCloner(StreamEventCloner streamEventCloner) {
         this.streamEventCloner = streamEventCloner;
@@ -88,10 +92,6 @@ protected ComplexEvent cloneComplexEvent(ComplexEvent complexEvent) {
 
     public abstract void stop();
 
-    public abstract Map<String, Object> currentState();
-
-    public abstract void restoreState(Map<String, Object> state);
-
     public void setQueryLock(LockWrapper lockWrapper) {
         this.lockWrapper = lockWrapper;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
index 0fe5b82a74..6d674a2311 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
@@ -25,6 +25,8 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,83 +36,86 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link PerSnapshotOutputRateLimiter} for queries with Windows.
  */
-public class WindowedPerSnapshotOutputRateLimiter extends SnapshotOutputRateLimiter {
+public class WindowedPerSnapshotOutputRateLimiter
+        extends SnapshotOutputRateLimiter<WindowedPerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
-    private final ScheduledExecutorService scheduledExecutorService;
-    private String id;
-    private List<ComplexEvent> eventList;
     private Comparator comparator;
     private Scheduler scheduler;
     private long scheduledTime;
 
-    public WindowedPerSnapshotOutputRateLimiter(String id, Long value, ScheduledExecutorService
-            scheduledExecutorService, WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
-                                                SiddhiQueryContext siddhiQueryContext) {
-        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-        this.id = id;
+    public WindowedPerSnapshotOutputRateLimiter(Long value,
+                                                WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
+                                                boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
+        super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext, groupBy);
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
-        this.eventList = new LinkedList<ComplexEvent>();
         this.comparator = new Comparator<ComplexEvent>() {
-
             @Override
             public int compare(ComplexEvent event1, ComplexEvent event2) {
                 if (Arrays.equals(event1.getOutputData(), event2.getOutputData())) {
                     return 0;
                 } else {
                     return 1;
-
                 }
             }
         };
     }
 
 
+    @Override
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
+    }
+
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         List<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event instanceof GroupedComplexEvent) {
-                    event = ((GroupedComplexEvent) event).getComplexEvent();
-                }
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event);
-                } else if (event.getType() == ComplexEvent.Type.CURRENT) {
-                    complexEventChunk.remove();
-                    tryFlushEvents(outputEventChunks, event);
-                    eventList.add(event);
-                } else if (event.getType() == ComplexEvent.Type.EXPIRED) {
-                    tryFlushEvents(outputEventChunks, event);
-                    for (Iterator<ComplexEvent> iterator = eventList.iterator(); iterator.hasNext(); ) {
-                        ComplexEvent currentEvent = iterator.next();
-                        if (comparator.compare(currentEvent, event) == 0) {
-                            iterator.remove();
-                            break;
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event instanceof GroupedComplexEvent) {
+                        event = ((GroupedComplexEvent) event).getComplexEvent();
+                    }
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        tryFlushEvents(outputEventChunks, event, state);
+                    } else if (event.getType() == ComplexEvent.Type.CURRENT) {
+                        complexEventChunk.remove();
+                        tryFlushEvents(outputEventChunks, event, state);
+                        state.eventList.add(event);
+                    } else if (event.getType() == ComplexEvent.Type.EXPIRED) {
+                        tryFlushEvents(outputEventChunks, event, state);
+                        for (Iterator<ComplexEvent> iterator = state.eventList.iterator(); iterator.hasNext(); ) {
+                            ComplexEvent currentEvent = iterator.next();
+                            if (comparator.compare(currentEvent, event) == 0) {
+                                iterator.remove();
+                                break;
+                            }
                         }
+                    } else if (event.getType() == ComplexEvent.Type.RESET) {
+                        tryFlushEvents(outputEventChunks, event, state);
+                        state.eventList.clear();
                     }
-                } else if (event.getType() == ComplexEvent.Type.RESET) {
-                    tryFlushEvents(outputEventChunks, event);
-                    eventList.clear();
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
         }
     }
 
-    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event) {
+    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
+                                RateLimiterState state) {
         if (event.getTimestamp() >= scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
-            for (ComplexEvent complexEvent : eventList) {
+            for (ComplexEvent complexEvent : state.eventList) {
                 outputEventChunk.add(cloneComplexEvent(complexEvent));
             }
             outputEventChunks.add(outputEventChunk);
@@ -119,16 +124,9 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
         }
     }
 
-    @Override
-    public SnapshotOutputRateLimiter clone(String key, WrappedSnapshotOutputRateLimiter
-            wrappedSnapshotOutputRateLimiter) {
-        return new WindowedPerSnapshotOutputRateLimiter(id + key, value, scheduledExecutorService,
-                wrappedSnapshotOutputRateLimiter, siddhiQueryContext);
-    }
-
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0,
                 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
@@ -142,18 +140,28 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("EventList", eventList);
+    class RateLimiterState extends State {
+
+        List<ComplexEvent> eventList = new LinkedList<ComplexEvent>();
+
+        @Override
+        public boolean canDestroy() {
+            return eventList.isEmpty();
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        eventList = (List<ComplexEvent>) state.get("EventList");
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("EventList", eventList);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            eventList = (List<ComplexEvent>) state.get("EventList");
+        }
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
index 7d5e9c2e84..4fac521f8d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
@@ -28,56 +28,46 @@
 import io.siddhi.core.event.stream.StreamEventCloner;
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
+import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregatorExecutor;
 import io.siddhi.core.query.selector.attribute.processor.AttributeProcessor;
-import io.siddhi.core.query.selector.attribute.processor.executor.AbstractAggregationAttributeExecutor;
 import io.siddhi.core.util.lock.LockWrapper;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link OutputRateLimiter} to be used by Snapshot Output Rate Limiting implementations.
+ *
+ * @param <S> current state of the RateLimiter
  */
-public class WrappedSnapshotOutputRateLimiter extends OutputRateLimiter {
+public class WrappedSnapshotOutputRateLimiter<S extends State> extends OutputRateLimiter<S> {
     private final Long value;
-    private final ScheduledExecutorService scheduledExecutorService;
     private final boolean groupBy;
     private final boolean windowed;
     private SiddhiQueryContext siddhiQueryContext;
     private SnapshotOutputRateLimiter outputRateLimiter;
-    private String id;
     private List<Integer> aggregateAttributePositionList = new ArrayList<Integer>();
 
-    public WrappedSnapshotOutputRateLimiter(String id, Long value, ScheduledExecutorService scheduledExecutorService,
-                                            boolean isGroupBy, boolean isWindowed,
+    public WrappedSnapshotOutputRateLimiter(Long value,
+                                            boolean groupBy, boolean isWindowed,
                                             SiddhiQueryContext siddhiQueryContext) {
-        this.id = id;
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
-        this.groupBy = isGroupBy;
+        this.groupBy = groupBy;
         this.windowed = isWindowed;
         this.siddhiQueryContext = siddhiQueryContext;
     }
 
-    @Override
-    public OutputRateLimiter clone(String key) {
-        WrappedSnapshotOutputRateLimiter instance = new WrappedSnapshotOutputRateLimiter(id + key, value,
-                scheduledExecutorService, groupBy, windowed, siddhiQueryContext);
-        instance.outputRateLimiter = this.outputRateLimiter.clone(key, instance);
-        return instance;
-    }
-
     public void init(SiddhiQueryContext siddhiQueryContext, LockWrapper lockWrapper) {
-        super.init(lockWrapper, siddhiQueryContext);
+        super.init(lockWrapper, groupBy, siddhiQueryContext);
         outputRateLimiter.setQueryLock(lockWrapper);
     }
 
     public void init(int outPutAttributeSize, List<AttributeProcessor> attributeProcessorList, MetaComplexEvent
             metaComplexEvent) {
         for (AttributeProcessor attributeProcessor : attributeProcessorList) {
-            if (attributeProcessor.getExpressionExecutor() instanceof AbstractAggregationAttributeExecutor) {
+            if (attributeProcessor.getExpressionExecutor() instanceof AttributeAggregatorExecutor<?>) {
                 aggregateAttributePositionList.add(attributeProcessor.getOutputPosition());
             }
         }
@@ -86,41 +76,41 @@ public void init(int outPutAttributeSize, List<AttributeProcessor> attributeProc
             if (groupBy) {
                 if (outPutAttributeSize == aggregateAttributePositionList.size()) {   //All Aggregation
                     outputRateLimiter = new AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter(
-                            id, value, scheduledExecutorService, this,
+                            value, this, groupBy,
                             siddhiQueryContext);
                 } else if (aggregateAttributePositionList.size() > 0) {   //Some Aggregation
                     outputRateLimiter = new AggregationGroupByWindowedPerSnapshotOutputRateLimiter(
-                            id, value, scheduledExecutorService, aggregateAttributePositionList,
-                            this, siddhiQueryContext);
+                            value, aggregateAttributePositionList,
+                            this, groupBy, siddhiQueryContext);
                 } else { // No aggregation
                     //GroupBy is same as Non GroupBy
                     outputRateLimiter = new WindowedPerSnapshotOutputRateLimiter(
-                            id, value, scheduledExecutorService, this,
+                            value, this, groupBy,
                             siddhiQueryContext);
                 }
             } else {
                 if (outPutAttributeSize == aggregateAttributePositionList.size()) {   //All Aggregation
                     outputRateLimiter = new AllAggregationPerSnapshotOutputRateLimiter(
-                            id, value, scheduledExecutorService, this,
+                            value, this, groupBy,
                             siddhiQueryContext);
                 } else if (aggregateAttributePositionList.size() > 0) {   //Some Aggregation
                     outputRateLimiter = new AggregationWindowedPerSnapshotOutputRateLimiter(
-                            id, value, scheduledExecutorService, aggregateAttributePositionList,
-                            this, siddhiQueryContext);
+                            value, aggregateAttributePositionList,
+                            this, groupBy, siddhiQueryContext);
                 } else { // No aggregation
                     outputRateLimiter = new WindowedPerSnapshotOutputRateLimiter(
-                            id, value, scheduledExecutorService, this,
-                            siddhiQueryContext);
+                            value, this,
+                            groupBy, siddhiQueryContext);
                 }
             }
 
         } else {
             if (groupBy) {
-                outputRateLimiter = new GroupByPerSnapshotOutputRateLimiter(id, value, scheduledExecutorService,
-                        this, siddhiQueryContext);
+                outputRateLimiter = new GroupByPerSnapshotOutputRateLimiter(value,
+                        this, groupBy, siddhiQueryContext);
             } else {
-                outputRateLimiter = new PerSnapshotOutputRateLimiter(id, value, scheduledExecutorService,
-                        this, siddhiQueryContext);
+                outputRateLimiter = new PerSnapshotOutputRateLimiter(value,
+                        this, groupBy, siddhiQueryContext);
             }
         }
 
@@ -148,6 +138,11 @@ public void stop() {
         outputRateLimiter.stop();
     }
 
+    @Override
+    protected StateFactory<S> init() {
+        return null;
+    }
+
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         outputRateLimiter.process(complexEventChunk);
@@ -157,13 +152,4 @@ public void passToCallBacks(ComplexEventChunk complexEventChunk) {
         sendToCallBacks(complexEventChunk);
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return outputRateLimiter.currentState();
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        outputRateLimiter.restoreState(state);
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
index c162c51b65..710130d323 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
@@ -25,6 +25,8 @@
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
@@ -37,29 +39,25 @@
  * collected events as a batch.
  */
 
-public class AllPerTimeOutputRateLimiter extends OutputRateLimiter implements Schedulable {
+public class AllPerTimeOutputRateLimiter
+        extends OutputRateLimiter<AllPerTimeOutputRateLimiter.RateLimiterState> implements Schedulable {
 
     private static final Logger log = Logger.getLogger(AllPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
     private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
-    private ComplexEventChunk<ComplexEvent> allComplexEventChunk;
     private long scheduledTime;
 
     public AllPerTimeOutputRateLimiter(String id, Long value, ScheduledExecutorService scheduledExecutorService) {
         this.id = id;
         this.value = value;
         this.scheduledExecutorService = scheduledExecutorService;
-        allComplexEventChunk = new ComplexEventChunk<ComplexEvent>(false);
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        AllPerTimeOutputRateLimiter instance = new AllPerTimeOutputRateLimiter(id + key, value,
-                scheduledExecutorService);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
@@ -67,28 +65,33 @@ public void process(ComplexEventChunk complexEventChunk) {
 
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    if (event.getTimestamp() >= scheduledTime) {
-                        ComplexEvent first = allComplexEventChunk.getFirst();
-                        if (first != null) {
-                            allComplexEventChunk.clear();
-                            ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
-                                    (complexEventChunk.isBatch());
-                            outputEventChunk.add(first);
-                            outputEventChunks.add(outputEventChunk);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        if (event.getTimestamp() >= scheduledTime) {
+                            ComplexEvent first = state.allComplexEventChunk.getFirst();
+                            if (first != null) {
+                                state.allComplexEventChunk.clear();
+                                ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
+                                        (complexEventChunk.isBatch());
+                                outputEventChunk.add(first);
+                                outputEventChunks.add(outputEventChunk);
+                            }
+                            scheduledTime = scheduledTime + value;
+                            scheduler.notifyAt(scheduledTime);
                         }
-                        scheduledTime = scheduledTime + value;
-                        scheduler.notifyAt(scheduledTime);
+                    } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
+                            .EXPIRED) {
+                        complexEventChunk.remove();
+                        state.allComplexEventChunk.add(event);
                     }
-                } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
-                        .EXPIRED) {
-                    complexEventChunk.remove();
-                    allComplexEventChunk.add(event);
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -97,7 +100,7 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -110,19 +113,30 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+    class RateLimiterState extends State {
+
+        private ComplexEventChunk<ComplexEvent> allComplexEventChunk =
+                new ComplexEventChunk<ComplexEvent>(false);
+
+
+        @Override
+        public boolean canDestroy() {
+            return allComplexEventChunk.getFirst() == null;
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        allComplexEventChunk.clear();
-        allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
-    }
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+            }
+            return state;
+        }
 
+        @Override
+        public void restore(Map<String, Object> state) {
+            allComplexEventChunk.clear();
+            allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
index 584a264bef..bd2796e847 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
@@ -26,6 +26,8 @@
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
@@ -38,12 +40,11 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit only first
  * event. This implementation specifically represent GroupBy queries.
  */
-public class FirstGroupByPerTimeOutputRateLimiter extends OutputRateLimiter implements Schedulable {
+public class FirstGroupByPerTimeOutputRateLimiter
+        extends OutputRateLimiter<FirstGroupByPerTimeOutputRateLimiter.RateLimiterState> implements Schedulable {
     private static final Logger log = Logger.getLogger(FirstGroupByPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private List<String> groupByKeys = new ArrayList<String>();
-    private ComplexEventChunk<ComplexEvent> allComplexEventChunk;
     private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
     private long scheduledTime;
@@ -53,49 +54,50 @@ public FirstGroupByPerTimeOutputRateLimiter(String id, Long value, ScheduledExec
         this.id = id;
         this.value = value;
         this.scheduledExecutorService = scheduledExecutorService;
-        this.allComplexEventChunk = new ComplexEventChunk<ComplexEvent>(false);
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        FirstGroupByPerTimeOutputRateLimiter instance = new FirstGroupByPerTimeOutputRateLimiter(id + key, value,
-                scheduledExecutorService);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    if (event.getTimestamp() >= scheduledTime) {
-                        if (allComplexEventChunk.getFirst() != null) {
-                            ComplexEventChunk<ComplexEvent> eventChunk = new ComplexEventChunk<ComplexEvent>
-                                    (complexEventChunk.isBatch());
-                            eventChunk.add(allComplexEventChunk.getFirst());
-                            allComplexEventChunk.clear();
-                            groupByKeys.clear();
-                            outputEventChunks.add(eventChunk);
-                        } else {
-                            groupByKeys.clear();
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        if (event.getTimestamp() >= scheduledTime) {
+                            if (state.allComplexEventChunk.getFirst() != null) {
+                                ComplexEventChunk<ComplexEvent> eventChunk = new ComplexEventChunk<ComplexEvent>
+                                        (complexEventChunk.isBatch());
+                                eventChunk.add(state.allComplexEventChunk.getFirst());
+                                state.allComplexEventChunk.clear();
+                                state.groupByKeys.clear();
+                                outputEventChunks.add(eventChunk);
+                            } else {
+                                state.groupByKeys.clear();
+                            }
+                            scheduledTime = scheduledTime + value;
+                            scheduler.notifyAt(scheduledTime);
+                        }
+                    } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
+                            .EXPIRED) {
+                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                        if (!state.groupByKeys.contains(groupedComplexEvent.getGroupKey())) {
+                            complexEventChunk.remove();
+                            state.groupByKeys.add(groupedComplexEvent.getGroupKey());
+                            state.allComplexEventChunk.add(groupedComplexEvent.getComplexEvent());
                         }
-                        scheduledTime = scheduledTime + value;
-                        scheduler.notifyAt(scheduledTime);
-                    }
-                } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
-                        .EXPIRED) {
-                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                    if (!groupByKeys.contains(groupedComplexEvent.getGroupKey())) {
-                        complexEventChunk.remove();
-                        groupByKeys.add(groupedComplexEvent.getGroupKey());
-                        allComplexEventChunk.add(groupedComplexEvent.getComplexEvent());
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -104,7 +106,7 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -117,21 +119,33 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
-            state.put("GroupByKeys", groupByKeys);
+    class RateLimiterState extends State {
+
+        private List<String> groupByKeys = new ArrayList<String>();
+        private ComplexEventChunk<ComplexEvent> allComplexEventChunk =
+                new ComplexEventChunk<ComplexEvent>(false);
+
+
+        @Override
+        public boolean canDestroy() {
+            return groupByKeys.size() == 0;
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        allComplexEventChunk.clear();
-        allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
-        groupByKeys = (List<String>) state.get("GroupByKeys");
-    }
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+                state.put("GroupByKeys", groupByKeys);
+            }
+            return state;
+        }
 
+        @Override
+        public void restore(Map<String, Object> state) {
+            allComplexEventChunk.clear();
+            allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
+            groupByKeys = (List<String>) state.get("GroupByKeys");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
index 116f16b57d..9853af6c41 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
@@ -25,6 +25,8 @@
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
@@ -36,7 +38,8 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit only first
  * event.
  */
-public class FirstPerTimeOutputRateLimiter extends OutputRateLimiter implements Schedulable {
+public class FirstPerTimeOutputRateLimiter
+        extends OutputRateLimiter<FirstPerTimeOutputRateLimiter.RateLimiterState> implements Schedulable {
     private static final Logger log = Logger.getLogger(FirstPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
@@ -52,50 +55,51 @@ public FirstPerTimeOutputRateLimiter(String id, Long value, ScheduledExecutorSer
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        FirstPerTimeOutputRateLimiter instance = new FirstPerTimeOutputRateLimiter(id + key, value,
-                scheduledExecutorService);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    if (event.getTimestamp() >= scheduledTime) {
-                        if (firstEvent != null) {
-                            firstEvent = null;
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        if (event.getTimestamp() >= scheduledTime) {
+                            if (firstEvent != null) {
+                                firstEvent = null;
+                            }
+                            scheduledTime += value;
+                            scheduler.notifyAt(scheduledTime);
+                        }
+                    } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
+                            .EXPIRED) {
+                        if (firstEvent == null) {
+                            complexEventChunk.remove();
+                            firstEvent = event;
+                            ComplexEventChunk<ComplexEvent> firstPerEventChunk = new ComplexEventChunk<ComplexEvent>
+                                    (complexEventChunk.isBatch());
+                            firstPerEventChunk.add(event);
+                            outputEventChunks.add(firstPerEventChunk);
                         }
-                        scheduledTime += value;
-                        scheduler.notifyAt(scheduledTime);
-                    }
-                } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
-                        .EXPIRED) {
-                    if (firstEvent == null) {
-                        complexEventChunk.remove();
-                        firstEvent = event;
-                        ComplexEventChunk<ComplexEvent> firstPerEventChunk = new ComplexEventChunk<ComplexEvent>
-                                (complexEventChunk.isBatch());
-                        firstPerEventChunk.add(event);
-                        outputEventChunks.add(firstPerEventChunk);
                     }
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
         }
-
     }
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -108,18 +112,28 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("FirstEvent", firstEvent);
+    class RateLimiterState extends State {
+
+        private ComplexEvent firstEvent = null;
+
+        @Override
+        public boolean canDestroy() {
+            return firstEvent == null;
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        firstEvent = (ComplexEvent) state.get("FirstEvent");
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("FirstEvent", firstEvent);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            firstEvent = (ComplexEvent) state.get("FirstEvent");
+        }
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
index 7df46bac41..4a47036777 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
@@ -27,6 +27,8 @@
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
@@ -39,11 +41,11 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit only last
  * event. This implementation specifically represent GroupBy queries.
  */
-public class LastGroupByPerTimeOutputRateLimiter extends OutputRateLimiter implements Schedulable {
+public class LastGroupByPerTimeOutputRateLimiter
+        extends OutputRateLimiter<LastGroupByPerTimeOutputRateLimiter.RateLimiterState> implements Schedulable {
     private static final Logger log = Logger.getLogger(LastGroupByPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private Map<String, ComplexEvent> allGroupByKeyEvents = new LinkedHashMap<String, ComplexEvent>();
     private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
     private long scheduledTime;
@@ -56,41 +58,44 @@ public LastGroupByPerTimeOutputRateLimiter(String id, Long value, ScheduledExecu
     }
 
     @Override
-    public OutputRateLimiter clone(String key) {
-        LastGroupByPerTimeOutputRateLimiter instance = new LastGroupByPerTimeOutputRateLimiter(id + key, value,
-                scheduledExecutorService);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory<RateLimiterState> init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
-        ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
+        ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<>();
         complexEventChunk.reset();
-        synchronized (this) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    if (event.getTimestamp() >= scheduledTime) {
-                        if (allGroupByKeyEvents.size() != 0) {
-                            ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
-                                    (complexEventChunk.isBatch());
-                            for (ComplexEvent complexEvent : allGroupByKeyEvents.values()) {
-                                outputEventChunk.add(complexEvent);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        if (event.getTimestamp() >= scheduledTime) {
+                            if (state.allGroupByKeyEvents.size() != 0) {
+                                ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
+                                        (complexEventChunk.isBatch());
+                                for (ComplexEvent complexEvent : state.allGroupByKeyEvents.values()) {
+                                    outputEventChunk.add(complexEvent);
+                                }
+                                outputEventChunks.add(outputEventChunk);
+                                state.allGroupByKeyEvents.clear();
                             }
-                            outputEventChunks.add(outputEventChunk);
-                            allGroupByKeyEvents.clear();
+                            scheduledTime = scheduledTime + value;
+                            scheduler.notifyAt(scheduledTime);
                         }
-                        scheduledTime = scheduledTime + value;
-                        scheduler.notifyAt(scheduledTime);
+                    } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
+                            .EXPIRED) {
+                        complexEventChunk.remove();
+                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                        state.allGroupByKeyEvents.put(groupedComplexEvent.getGroupKey(),
+                                groupedComplexEvent.getComplexEvent());
                     }
-                } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
-                        .EXPIRED) {
-                    complexEventChunk.remove();
-                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                    allGroupByKeyEvents.put(groupedComplexEvent.getGroupKey(), groupedComplexEvent.getComplexEvent());
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -100,7 +105,7 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -113,18 +118,29 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
+
+    class RateLimiterState extends State {
+
+        private Map<String, ComplexEvent> allGroupByKeyEvents = new LinkedHashMap<String, ComplexEvent>();
+
+        @Override
+        public boolean canDestroy() {
+            return allGroupByKeyEvents.size() == 0;
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        allGroupByKeyEvents = (Map<String, ComplexEvent>) state.get("AllGroupByKeyEvents");
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            allGroupByKeyEvents = (Map<String, ComplexEvent>) state.get("AllGroupByKeyEvents");
+        }
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
index 8e2bdea371..270411f261 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
@@ -25,6 +25,8 @@
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
@@ -36,11 +38,11 @@
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit only last
  * event.
  */
-public class LastPerTimeOutputRateLimiter extends OutputRateLimiter implements Schedulable {
+public class LastPerTimeOutputRateLimiter extends OutputRateLimiter<LastPerTimeOutputRateLimiter.RateLimiterState>
+        implements Schedulable {
     private static final Logger log = Logger.getLogger(LastPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private ComplexEvent lastEvent = null;
     private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
     private long scheduledTime;
@@ -51,40 +53,43 @@ public LastPerTimeOutputRateLimiter(String id, Long value, ScheduledExecutorServ
         this.scheduledExecutorService = scheduledExecutorService;
     }
 
+
     @Override
-    public OutputRateLimiter clone(String key) {
-        LastPerTimeOutputRateLimiter instance = new LastPerTimeOutputRateLimiter(id + key, value,
-                scheduledExecutorService);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
+    protected StateFactory init() {
+        return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
         complexEventChunk.reset();
-        synchronized (this) {
-            complexEventChunk.reset();
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    if (event.getTimestamp() >= scheduledTime) {
-                        if (lastEvent != null) {
-                            ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
-                                    (complexEventChunk.isBatch());
-                            outputEventChunk.add(lastEvent);
-                            lastEvent = null;
-                            outputEventChunks.add(outputEventChunk);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                complexEventChunk.reset();
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        if (event.getTimestamp() >= scheduledTime) {
+                            if (state.lastEvent != null) {
+                                ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
+                                        (complexEventChunk.isBatch());
+                                outputEventChunk.add(state.lastEvent);
+                                state.lastEvent = null;
+                                outputEventChunks.add(outputEventChunk);
+                            }
+                            scheduledTime = scheduledTime + value;
+                            scheduler.notifyAt(scheduledTime);
                         }
-                        scheduledTime = scheduledTime + value;
-                        scheduler.notifyAt(scheduledTime);
+                    } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
+                            .EXPIRED) {
+                        complexEventChunk.remove();
+                        state.lastEvent = event;
                     }
-                } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
-                        .EXPIRED) {
-                    complexEventChunk.remove();
-                    lastEvent = event;
                 }
             }
+        } finally {
+            stateHolder.returnState(state);
         }
         for (ComplexEventChunk eventChunk : outputEventChunks) {
             sendToCallBacks(eventChunk);
@@ -93,7 +98,7 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext.getSiddhiAppContext());
+        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
         scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
@@ -106,18 +111,29 @@ public void stop() {
         //Nothing to stop
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("LastEvent", lastEvent);
+
+    class RateLimiterState extends State {
+
+        private ComplexEvent lastEvent = null;
+
+        @Override
+        public boolean canDestroy() {
+            return lastEvent == null;
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        lastEvent = (ComplexEvent) state.get("LastEvent");
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("LastEvent", lastEvent);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            lastEvent = (ComplexEvent) state.get("LastEvent");
+        }
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/Processor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/Processor.java
index 3aee21996e..fc03b84d4f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/Processor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/Processor.java
@@ -55,17 +55,4 @@ public interface Processor {
      */
     void setToLast(Processor processor);
 
-    /**
-     * Clone a copy of processor
-     *
-     * @param key partition key
-     * @return cloned processor
-     */
-    Processor cloneProcessor(String key);
-
-    /**
-     * Used to clean its references
-     */
-    void clean();
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/filter/FilterProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/filter/FilterProcessor.java
index 21d486e844..399ec4cf2a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/filter/FilterProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/filter/FilterProcessor.java
@@ -42,15 +42,6 @@ public FilterProcessor(ExpressionExecutor conditionExecutor) {
         }
     }
 
-    public FilterProcessor cloneProcessor(String key) {
-        return new FilterProcessor(conditionExecutor.cloneExecutor(key));
-    }
-
-    @Override
-    public void clean() {
-        conditionExecutor.clean();
-    }
-
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/AbstractStreamProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/AbstractStreamProcessor.java
index 8b8f8d39ba..f77df02d0b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/AbstractStreamProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/AbstractStreamProcessor.java
@@ -26,13 +26,14 @@
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.event.stream.populater.StreamEventPopulaterFactory;
 import io.siddhi.core.exception.SiddhiAppCreationException;
-import io.siddhi.core.exception.SiddhiAppRuntimeException;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.config.ConfigReader;
-import io.siddhi.core.util.extension.holder.EternalReferencedHolder;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.SiddhiElement;
 import io.siddhi.query.api.definition.AbstractDefinition;
 import io.siddhi.query.api.definition.Attribute;
@@ -43,50 +44,43 @@
 
 /**
  * Abstract implementation of {@link Processor} intended to be used by any Stream Processors.
+ *
+ * @param <S> current state of the processor
  */
-public abstract class AbstractStreamProcessor implements Processor, EternalReferencedHolder, Snapshotable {
+public abstract class AbstractStreamProcessor<S extends State> implements Processor, ExternalReferencedHolder {
 
     private static final Logger log = Logger.getLogger(AbstractStreamProcessor.class);
 
     protected Processor nextProcessor;
-
-    protected List<Attribute> additionalAttributes;
+    private List<Attribute> additionalAttributes;
     protected MetaStreamEvent metaStreamEvent;
     protected SiddhiQueryContext siddhiQueryContext;
     protected StreamEventClonerHolder streamEventClonerHolder = new StreamEventClonerHolder();
-    protected StreamEventCloner streamEventCloner;
     protected AbstractDefinition inputDefinition;
     protected ExpressionExecutor[] attributeExpressionExecutors;
     protected int attributeExpressionLength;
     protected ComplexEventPopulater complexEventPopulater;
-    protected String elementId = null;
-    private ConfigReader configReader;
-    private boolean outputExpectsExpiredEvents;
+    protected StateHolder<S> stateHolder;
 
     public void initProcessor(MetaStreamEvent metaStreamEvent,
                               ExpressionExecutor[] attributeExpressionExecutors,
                               ConfigReader configReader,
                               boolean outputExpectsExpiredEvents,
-                              SiddhiElement siddhiElement, SiddhiQueryContext siddhiQueryContext) {
-        this.configReader = configReader;
-        this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
+                              boolean findToBeExecuted,
+                              boolean groupBy, SiddhiElement siddhiElement,
+                              SiddhiQueryContext siddhiQueryContext) {
         this.metaStreamEvent = metaStreamEvent;
         this.siddhiQueryContext = siddhiQueryContext;
         try {
             this.inputDefinition = metaStreamEvent.getLastInputDefinition();
             this.attributeExpressionExecutors = attributeExpressionExecutors;
             this.attributeExpressionLength = attributeExpressionExecutors.length;
-            if (elementId == null) {
-                elementId = "AbstractStreamProcessor-" +
-                        siddhiQueryContext.getSiddhiAppContext().getElementIdGenerator().createNewId();
-            }
-            siddhiQueryContext.getSiddhiAppContext().getSnapshotService().addSnapshotable(
-                    siddhiQueryContext.getName(), this);
-            this.additionalAttributes = init(metaStreamEvent, metaStreamEvent.getLastInputDefinition(),
-                    attributeExpressionExecutors, configReader, outputExpectsExpiredEvents, siddhiQueryContext);
-
+            StateFactory<S> stateFactory = init(metaStreamEvent, metaStreamEvent.getLastInputDefinition(),
+                    attributeExpressionExecutors, configReader, streamEventClonerHolder, outputExpectsExpiredEvents,
+                    findToBeExecuted, siddhiQueryContext);
+            this.additionalAttributes = getReturnAttributes();
+            this.stateHolder = siddhiQueryContext.generateStateHolder(this.getClass().getName(), groupBy, stateFactory);
             siddhiQueryContext.getSiddhiAppContext().addEternalReferencedHolder(this);
-
             if (additionalAttributes.size() > 0) {
                 StreamDefinition outputDefinition = StreamDefinition.id(inputDefinition.getId());
                 outputDefinition.setQueryContextStartIndex(siddhiElement.getQueryContextStartIndex());
@@ -114,20 +108,31 @@ public void initProcessor(MetaStreamEvent metaStreamEvent,
      * @param inputDefinition              the incoming stream definition
      * @param attributeExpressionExecutors the executors of each function parameters
      * @param configReader                 this hold the {@link AbstractStreamProcessor} extensions configuration
-     *                                     reader.
+     * @param streamEventClonerHolder      stream event cloner holder
      * @param outputExpectsExpiredEvents   is expired events sent as output
+     * @param findToBeExecuted             find will be executed
      * @param siddhiQueryContext           current siddhi query context
-     * @return the additional output attributes introduced by the function
      */
-    protected abstract List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
+    protected abstract StateFactory<S> init(MetaStreamEvent metaStreamEvent,
+                                            AbstractDefinition inputDefinition,
                                             ExpressionExecutor[] attributeExpressionExecutors,
                                             ConfigReader configReader,
-                                            boolean outputExpectsExpiredEvents,
+                                            StreamEventClonerHolder streamEventClonerHolder,
+                                            boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
                                             SiddhiQueryContext siddhiQueryContext);
 
+    public abstract List<Attribute> getReturnAttributes();
+
     public void process(ComplexEventChunk streamEventChunk) {
         streamEventChunk.reset();
-        processEventChunk(streamEventChunk, nextProcessor, streamEventCloner, complexEventPopulater);
+        S state = stateHolder.getState();
+        try {
+            processEventChunk(streamEventChunk, nextProcessor, streamEventClonerHolder.getStreamEventCloner(),
+                    complexEventPopulater, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
+
     }
 
     /**
@@ -137,10 +142,13 @@ public void process(ComplexEventChunk streamEventChunk) {
      * @param nextProcessor         the next processor to which the success events need to be passed
      * @param streamEventCloner     helps to clone the incoming event for local storage or modification
      * @param complexEventPopulater helps to populate the events with the resultant attributes
+     * @param state                 current state of the processor
      */
-    protected abstract void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
+    protected abstract void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk,
+                                              Processor nextProcessor,
                                               StreamEventCloner streamEventCloner,
-                                              ComplexEventPopulater complexEventPopulater);
+                                              ComplexEventPopulater complexEventPopulater,
+                                              S state);
 
     public Processor getNextProcessor() {
         return nextProcessor;
@@ -150,40 +158,6 @@ public void setNextProcessor(Processor processor) {
         this.nextProcessor = processor;
     }
 
-    @Override
-    public Processor cloneProcessor(String key) {
-        try {
-            AbstractStreamProcessor abstractStreamProcessor = this.getClass().newInstance();
-            abstractStreamProcessor.inputDefinition = inputDefinition;
-            ExpressionExecutor[] innerExpressionExecutors = new ExpressionExecutor[attributeExpressionLength];
-            ExpressionExecutor[] attributeExpressionExecutors1 = this.attributeExpressionExecutors;
-            for (int i = 0; i < attributeExpressionLength; i++) {
-                innerExpressionExecutors[i] = attributeExpressionExecutors1[i].cloneExecutor(key);
-            }
-            abstractStreamProcessor.attributeExpressionExecutors = innerExpressionExecutors;
-            abstractStreamProcessor.attributeExpressionLength = attributeExpressionLength;
-            abstractStreamProcessor.additionalAttributes = additionalAttributes;
-            abstractStreamProcessor.additionalAttributes = additionalAttributes;
-            abstractStreamProcessor.complexEventPopulater = complexEventPopulater;
-            abstractStreamProcessor.siddhiQueryContext = siddhiQueryContext;
-            abstractStreamProcessor.elementId = elementId + "-" + key;
-            abstractStreamProcessor.configReader = configReader;
-            abstractStreamProcessor.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
-            abstractStreamProcessor.siddhiQueryContext.getSiddhiAppContext().getSnapshotService()
-                    .addSnapshotable(siddhiQueryContext.getName(), abstractStreamProcessor);
-            abstractStreamProcessor.siddhiQueryContext.getSiddhiAppContext().addEternalReferencedHolder(
-                    abstractStreamProcessor);
-
-            abstractStreamProcessor.init(metaStreamEvent, inputDefinition, attributeExpressionExecutors, configReader,
-                    outputExpectsExpiredEvents, siddhiQueryContext);
-            abstractStreamProcessor.start();
-            return abstractStreamProcessor;
-
-        } catch (Exception e) {
-            throw new SiddhiAppRuntimeException("Exception in cloning " + this.getClass().getCanonicalName(), e);
-        }
-    }
-
     public void constructStreamEventPopulater(MetaStreamEvent metaStreamEvent, int streamEventChainIndex) {
         if (this.complexEventPopulater == null) {
             this.complexEventPopulater = StreamEventPopulaterFactory.constructEventPopulator(metaStreamEvent,
@@ -193,7 +167,6 @@ public void constructStreamEventPopulater(MetaStreamEvent metaStreamEvent, int s
     }
 
     public void setStreamEventCloner(StreamEventCloner streamEventCloner) {
-        this.streamEventCloner = streamEventCloner;
         this.streamEventClonerHolder.setStreamEventCloner(streamEventCloner);
     }
 
@@ -205,20 +178,6 @@ public void setToLast(Processor processor) {
         }
     }
 
-    @Override
-    public String getElementId() {
-        return elementId;
-    }
-
-    @Override
-    public void clean() {
-        for (ExpressionExecutor expressionExecutor : attributeExpressionExecutors) {
-            expressionExecutor.clean();
-        }
-        siddhiQueryContext.getSiddhiAppContext().getSnapshotService().removeSnapshotable(
-                siddhiQueryContext.getName(), this);
-    }
-
     /**
      * Defines the behaviour of the processing, will be called after the init
      *
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/LogStreamProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/LogStreamProcessor.java
index e6dc5aa48d..c556160201 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/LogStreamProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/LogStreamProcessor.java
@@ -28,12 +28,15 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.AbstractDefinition;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
@@ -41,7 +44,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Input attributes to log is (priority (String), log.message (String), is.event.logged (Bool))
@@ -97,7 +99,7 @@
                 )
         }
 )
-public class LogStreamProcessor extends StreamProcessor {
+public class LogStreamProcessor extends StreamProcessor<State> {
     private static final Logger log = Logger.getLogger(LogStreamProcessor.class);
     private ExpressionExecutor isLogEventExpressionExecutor = null;
     private ExpressionExecutor logMessageExpressionExecutor = null;
@@ -112,13 +114,17 @@ public class LogStreamProcessor extends StreamProcessor {
      * @param inputDefinition              the incoming stream definition
      * @param attributeExpressionExecutors the executors for the function parameters
      * @param configReader                 this hold the {@link LogStreamProcessor} configuration reader.
+     * @param streamEventClonerHolder      streamEventCloner Holder
+     * @param findToBeExecuted             find will be executed
      * @param siddhiQueryContext           current siddhi query context
      * @return the additional output attributes introduced by the function
      */
     @Override
-    protected List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
-                                   ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                                   boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
+                                ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                StreamEventClonerHolder streamEventClonerHolder,
+                                boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                SiddhiQueryContext siddhiQueryContext) {
         int inputExecutorLength = attributeExpressionExecutors.length;
         if (inputExecutorLength == 1) {
             if (attributeExpressionExecutors[0].getReturnType() == Attribute.Type.STRING) {
@@ -183,12 +189,18 @@ protected List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefiniti
                     "isEventLogged (Bool), but there are " + attributeExpressionExecutors.length + " in the input!");
         }
         logPrefix = siddhiQueryContext.getSiddhiAppContext().getName() + ": ";
+        return null;
+    }
+
+    @Override
+    public List<Attribute> getReturnAttributes() {
         return new ArrayList<Attribute>();
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater) {
+                           StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater,
+                           State state) {
         while (streamEventChunk.hasNext()) {
             ComplexEvent complexEvent = streamEventChunk.next();
             switch (attributeExpressionLength) {
@@ -279,17 +291,6 @@ public void stop() {
         //Do nothing
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        //No state
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
-
     @Override
     public ProcessingMode getProcessingMode() {
         return ProcessingMode.BATCH;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/StreamProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/StreamProcessor.java
index 921e90a042..7de60697fd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/StreamProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/StreamProcessor.java
@@ -22,19 +22,23 @@
 import io.siddhi.core.event.stream.StreamEventCloner;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.query.processor.Processor;
+import io.siddhi.core.util.snapshot.state.State;
 
 /**
  * For Siddhi extensions, extend this class to use the functionality of
  * AbstractStreamProcessor. This class processes only StreamEvents. Use
  * StreamFunctionProcessor to process StateEvents.
+ *
+ * @param <S> current state of the processor
  */
-public abstract class StreamProcessor extends AbstractStreamProcessor {
+public abstract class StreamProcessor<S extends State> extends AbstractStreamProcessor<S> {
 
     @Override
     protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater) {
+                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater,
+                                     S state) {
         streamEventChunk.reset();
-        process(streamEventChunk, nextProcessor, streamEventCloner, complexEventPopulater);
+        process(streamEventChunk, nextProcessor, streamEventCloner, complexEventPopulater, state);
     }
 
 
@@ -45,8 +49,10 @@ protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk
      * @param nextProcessor         the next processor to which the success events need to be passed
      * @param streamEventCloner     helps to clone the incoming event for local storage or modification
      * @param complexEventPopulater helps to populate the events with the resultant attributes
+     * @param state                 current processor state
      */
     protected abstract void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                    StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater);
+                                    StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater,
+                                    S state);
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/function/Pol2CartStreamFunctionProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/function/Pol2CartStreamFunctionProcessor.java
index ac2e0e7fdb..d2b7fe55fb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/function/Pol2CartStreamFunctionProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/function/Pol2CartStreamFunctionProcessor.java
@@ -25,13 +25,13 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.AbstractDefinition;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created on 1/26/15.
@@ -73,6 +73,7 @@ public class Pol2CartStreamFunctionProcessor extends StreamFunctionProcessor {
 
 
     private int inputExecutorLength;
+    private List<Attribute> retrunAttributes;
 
     /**
      * The init method of the StreamFunction
@@ -83,10 +84,10 @@ public class Pol2CartStreamFunctionProcessor extends StreamFunctionProcessor {
      * @return the additional output attributes introduced by the function
      */
     @Override
-    protected List<Attribute> init(AbstractDefinition inputDefinition,
-                                   ExpressionExecutor[] attributeExpressionExecutors,
-                                   ConfigReader configReader, boolean outputExpectsExpiredEvents,
-                                   SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(AbstractDefinition inputDefinition,
+                                ExpressionExecutor[] attributeExpressionExecutors,
+                                ConfigReader configReader, boolean outputExpectsExpiredEvents,
+                                SiddhiQueryContext siddhiQueryContext) {
         inputExecutorLength = attributeExpressionExecutors.length;
 
         if (inputExecutorLength < 2 || inputExecutorLength > 3) {
@@ -109,7 +110,9 @@ protected List<Attribute> init(AbstractDefinition inputDefinition,
                             "not contain attributes with name 'x' or 'y', but found " + attribute);
                 }
             }
-            return Arrays.asList(new Attribute("x", Attribute.Type.DOUBLE), new Attribute("y", Attribute.Type.DOUBLE));
+            retrunAttributes = Arrays.asList(
+                    new Attribute("x", Attribute.Type.DOUBLE),
+                    new Attribute("y", Attribute.Type.DOUBLE));
         } else {
             for (Attribute attribute : inputDefinition.getAttributeList()) {
                 if (attribute.getName().equals("x") || attribute.getName().equals("y") || attribute.getName().equals
@@ -118,9 +121,12 @@ protected List<Attribute> init(AbstractDefinition inputDefinition,
                             "not contain attributes with name 'x' or 'y' or 'z', but found " + attribute);
                 }
             }
-            return Arrays.asList(new Attribute("x", Attribute.Type.DOUBLE), new Attribute("y", Attribute.Type.DOUBLE)
-                    , new Attribute("z", Attribute.Type.DOUBLE));
+            retrunAttributes = Arrays.asList(
+                    new Attribute("x", Attribute.Type.DOUBLE),
+                    new Attribute("y", Attribute.Type.DOUBLE),
+                    new Attribute("z", Attribute.Type.DOUBLE));
         }
+        return null;
     }
 
     /**
@@ -164,15 +170,8 @@ public void stop() {
         //Do nothing
     }
 
-
-    @Override
-    public Map<String, Object> currentState() {
-        //No state
-        return null;
-    }
-
     @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
+    public List<Attribute> getReturnAttributes() {
+        return retrunAttributes;
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/function/StreamFunctionProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/function/StreamFunctionProcessor.java
index 721f023b00..623f75eca8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/function/StreamFunctionProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/function/StreamFunctionProcessor.java
@@ -23,25 +23,28 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.query.processor.stream.AbstractStreamProcessor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.AbstractDefinition;
-import io.siddhi.query.api.definition.Attribute;
-
-import java.util.List;
 
 /**
  * Stream Processor to handle Stream Functions.
+ *
+ * @param <S> current state of the processor
  */
-public abstract class StreamFunctionProcessor extends AbstractStreamProcessor {
+public abstract class StreamFunctionProcessor<S extends State> extends AbstractStreamProcessor<S> {
 
     @Override
     protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater) {
+                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater,
+                                     S state) {
         while (streamEventChunk.hasNext()) {
             ComplexEvent complexEvent = streamEventChunk.next();
             Object[] outputData;
@@ -96,14 +99,16 @@ public ProcessingMode getProcessingMode() {
      * @param inputDefinition              the incoming stream definition
      * @param attributeExpressionExecutors the executors of each function parameters
      * @param configReader                 this hold the {@link StreamFunctionProcessor} extensions configuration
-     *                                     reader.
+     * @param streamEventClonerHolder      stream event cloner Holder
      * @param outputExpectsExpiredEvents   is expired events sent as output
+     * @param findToBeExecuted             find operation will be performed
      * @param siddhiQueryContext           siddhi query context
-     * @return the additional output attributes introduced by the function
      */
-    protected List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
+    protected StateFactory<S> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
                                    ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                                   boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+                                   StreamEventClonerHolder streamEventClonerHolder,
+                                   boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                   SiddhiQueryContext siddhiQueryContext) {
         return init(inputDefinition, attributeExpressionExecutors, configReader, outputExpectsExpiredEvents,
                 siddhiQueryContext);
     }
@@ -119,7 +124,7 @@ protected List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefiniti
      * @param siddhiQueryContext           the context of the siddhi query
      * @return the additional output attributes introduced by the function
      */
-    protected abstract List<Attribute> init(AbstractDefinition inputDefinition,
+    protected abstract StateFactory<S> init(AbstractDefinition inputDefinition,
                                             ExpressionExecutor[] attributeExpressionExecutors,
                                             ConfigReader configReader, boolean outputExpectsExpiredEvents,
                                             SiddhiQueryContext siddhiQueryContext);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/AggregateWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/AggregateWindowProcessor.java
index 9ef758709e..925269205e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/AggregateWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/AggregateWindowProcessor.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.exception.SiddhiAppRuntimeException;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.query.input.stream.join.JoinProcessor;
@@ -31,6 +31,8 @@
 import io.siddhi.core.util.collection.operator.CompiledCondition;
 import io.siddhi.core.util.collection.operator.MatchingMetaInfoHolder;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.aggregation.Within;
 import io.siddhi.query.api.expression.Expression;
 
@@ -48,9 +50,6 @@ public class AggregateWindowProcessor extends BatchingWindowProcessor implements
     private final Within within;
     private final Expression per;
     private AggregationRuntime aggregationRuntime;
-    private ConfigReader configReader;
-    private boolean outputExpectsExpiredEvents;
-    private SiddhiQueryContext siddhiQueryContext;
 
     public AggregateWindowProcessor(AggregationRuntime aggregationRuntime, Within within, Expression per) {
         this.aggregationRuntime = aggregationRuntime;
@@ -59,24 +58,25 @@ public AggregateWindowProcessor(AggregationRuntime aggregationRuntime, Within wi
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                StreamEventClonerHolder streamEventClonerHolder, boolean outputExpectsExpiredEvents,
+                                boolean findToBeExecuted, SiddhiQueryContext siddhiQueryContext) {
         // nothing to be done
-        this.configReader = configReader;
-        this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
-        this.siddhiQueryContext = siddhiQueryContext;
+        return null;
     }
 
     @Override
-    protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
+    protected void process(ComplexEventChunk streamEventChunk, Processor nextProcessor,
+                           StreamEventCloner streamEventCloner, State state) {
         // Pass the event  to the post JoinProcessor
         nextProcessor.process(streamEventChunk);
     }
 
+
     @Override
     public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return aggregationRuntime.find(matchingEvent, compiledCondition);
+        return aggregationRuntime.find(matchingEvent, compiledCondition, siddhiQueryContext);
+
     }
 
     @Override
@@ -96,39 +96,4 @@ public void start() {
     public void stop() {
         //Do nothing
     }
-
-    @Override
-    public Processor cloneProcessor(String key) {
-        try {
-            AggregateWindowProcessor streamProcessor = new AggregateWindowProcessor(aggregationRuntime, within, per);
-            streamProcessor.inputDefinition = inputDefinition;
-            ExpressionExecutor[] innerExpressionExecutors = new ExpressionExecutor[attributeExpressionLength];
-            ExpressionExecutor[] attributeExpressionExecutors1 = this.attributeExpressionExecutors;
-            for (int i = 0; i < attributeExpressionLength; i++) {
-                innerExpressionExecutors[i] = attributeExpressionExecutors1[i].cloneExecutor(key);
-            }
-            streamProcessor.attributeExpressionExecutors = innerExpressionExecutors;
-            streamProcessor.attributeExpressionLength = attributeExpressionLength;
-            streamProcessor.additionalAttributes = additionalAttributes;
-            streamProcessor.complexEventPopulater = complexEventPopulater;
-            streamProcessor.init(metaStreamEvent, inputDefinition, attributeExpressionExecutors, configReader,
-                    outputExpectsExpiredEvents, siddhiQueryContext);
-            streamProcessor.start();
-            return streamProcessor;
-
-        } catch (Exception e) {
-            throw new SiddhiAppRuntimeException("Exception in cloning " + this.getClass().getCanonicalName(), e);
-        }
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        //No state
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchWindowProcessor.java
index 6f26822d35..a35c53f1a8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchWindowProcessor.java
@@ -28,6 +28,7 @@
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
 import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -39,6 +40,8 @@
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
 
@@ -80,25 +83,22 @@
                 )
         }
 )
-public class BatchWindowProcessor extends BatchingWindowProcessor implements FindableProcessor {
+public class BatchWindowProcessor extends BatchingFindableWindowProcessor<BatchWindowProcessor.WindowState> {
 
     private int length = 0;
-    private int count = 0;
-    private SnapshotableStreamEventQueue expiredEventQueue = null;
-    private SnapshotableStreamEventQueue currentEventQueue;
     private boolean outputExpectsExpiredEvents;
+    private boolean findToBeExecuted;
     private SiddhiQueryContext siddhiQueryContext;
-    private StreamEvent resetEvent = null;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<WindowState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                             ConfigReader configReader,
+                                             StreamEventClonerHolder streamEventClonerHolder,
+                                             boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                             SiddhiQueryContext siddhiQueryContext) {
         this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
+        this.findToBeExecuted = findToBeExecuted;
         this.siddhiQueryContext = siddhiQueryContext;
-        currentEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
-        if (outputExpectsExpiredEvents) {
-            expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
-        }
         if (attributeExpressionExecutors.length == 1) {
             length = (Integer) (((ConstantExpressionExecutor) attributeExpressionExecutors[0]).getValue());
         } else if (attributeExpressionExecutors.length == 0) {
@@ -111,30 +111,32 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             throw new SiddhiAppValidationException("Batch window should have at most one parameter (<int> " +
                     "chunkLength) greater than zero. But found value 'chunkLength = " + length + " ' ");
         }
+        return () -> new WindowState(streamEventClonerHolder, outputExpectsExpiredEvents, findToBeExecuted);
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
         List<ComplexEventChunk<StreamEvent>> streamEventChunks = new ArrayList<ComplexEventChunk<StreamEvent>>();
         ComplexEventChunk<StreamEvent> currentEventChunk = new ComplexEventChunk<StreamEvent>(true);
-        synchronized (this) {
+        synchronized (state) {
             long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
             if (outputExpectsExpiredEvents) {
-                if (expiredEventQueue.getFirst() != null) {
-                    while (expiredEventQueue.hasNext()) {
-                        expiredEventQueue.next().setTimestamp(currentTime);
+                if (state.expiredEventQueue.getFirst() != null) {
+                    while (state.expiredEventQueue.hasNext()) {
+                        state.expiredEventQueue.next().setTimestamp(currentTime);
                     }
-                    currentEventChunk.add(expiredEventQueue.getFirst());
-                    if (resetEvent != null) {
-                        currentEventChunk.add(resetEvent);
-                        resetEvent = null;
+                    currentEventChunk.add(state.expiredEventQueue.getFirst());
+                    if (state.resetEvent != null) {
+                        currentEventChunk.add(state.resetEvent);
+                        state.resetEvent = null;
                     }
                 }
-                expiredEventQueue.clear();
+                state.expiredEventQueue.clear();
             }
-
             //check whether the streamEventChunk has next event before add into output stream event chunk
+            ComplexEventChunk<StreamEvent> currentEventQueue = new ComplexEventChunk<>(true);
+            int count = 0;
             if (streamEventChunk.hasNext()) {
                 do {
                     StreamEvent streamEvent = streamEventChunk.next();
@@ -142,17 +144,17 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                     if (outputExpectsExpiredEvents) {
                         StreamEvent clonedStreamEventToExpire = streamEventCloner.copyStreamEvent(streamEvent);
                         clonedStreamEventToExpire.setType(StreamEvent.Type.EXPIRED);
-                        expiredEventQueue.add(clonedStreamEventToExpire);
+                        state.expiredEventQueue.add(clonedStreamEventToExpire);
                     }
                     currentEventQueue.add(clonedStreamEventToProcess);
                     count++;
                     if (count == length) {
                         if (currentEventQueue.getFirst() != null) {
-                            if (resetEvent != null) {
-                                currentEventChunk.add(resetEvent);
+                            if (state.resetEvent != null) {
+                                currentEventChunk.add(state.resetEvent);
                             }
-                            resetEvent = streamEventCloner.copyStreamEvent(currentEventQueue.getFirst());
-                            resetEvent.setType(ComplexEvent.Type.RESET);
+                            state.resetEvent = streamEventCloner.copyStreamEvent(currentEventQueue.getFirst());
+                            state.resetEvent.setType(ComplexEvent.Type.RESET);
                             currentEventChunk.add(currentEventQueue.getFirst());
                         }
                         count = 0;
@@ -164,15 +166,13 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                     }
                 } while (streamEventChunk.hasNext());
                 if (currentEventQueue.getFirst() != null) {
-                    if (resetEvent != null) {
-                        currentEventChunk.add(resetEvent);
+                    if (state.resetEvent != null) {
+                        currentEventChunk.add(state.resetEvent);
                     }
-                    resetEvent = streamEventCloner.copyStreamEvent(currentEventQueue.getFirst());
-                    resetEvent.setType(ComplexEvent.Type.RESET);
+                    state.resetEvent = streamEventCloner.copyStreamEvent(currentEventQueue.getFirst());
+                    state.resetEvent.setType(ComplexEvent.Type.RESET);
                     currentEventChunk.add(currentEventQueue.getFirst());
                 }
-                count = 0;
-                currentEventQueue.clear();
                 if (currentEventChunk.getFirst() != null) {
                     streamEventChunks.add(currentEventChunk);
                 }
@@ -194,40 +194,53 @@ public void stop() {
     }
 
     @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            if (outputExpectsExpiredEvents) {
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventQueue, streamEventCloner);
+    }
+
+    @Override
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventQueue, condition, matchingMetaInfoHolder,
+                variableExpressionExecutors, tableMap, siddhiQueryContext);
+    }
+
+    class WindowState extends State {
+        private SnapshotableStreamEventQueue expiredEventQueue;
+        private StreamEvent resetEvent = null;
+
+        WindowState(StreamEventClonerHolder streamEventClonerHolder,
+                    boolean outputExpectsExpiredEvents, boolean findToBeExecuted) {
+            if (outputExpectsExpiredEvents || findToBeExecuted) {
+                expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+            }
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+
+            if (outputExpectsExpiredEvents || findToBeExecuted) {
                 state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
             }
             state.put("ResetEvent", resetEvent);
+            return state;
         }
-        return state;
-    }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        if (outputExpectsExpiredEvents) {
-            expiredEventQueue.clear();
-            expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+        public void restore(Map<String, Object> state) {
+            if (outputExpectsExpiredEvents || findToBeExecuted) {
+                expiredEventQueue.clear();
+                expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+            }
+            resetEvent = (StreamEvent) state.get("ResetEvent");
         }
-        resetEvent = (StreamEvent) state.get("ResetEvent");
-    }
 
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventQueue, streamEventCloner);
-    }
-
-    @Override
-    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
-                                              List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        if (expiredEventQueue == null) {
-            expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+        @Override
+        public boolean canDestroy() {
+            return expiredEventQueue.getFirst() == null && resetEvent == null;
         }
-        return OperatorParser.constructOperator(expiredEventQueue, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap,
-                siddhiQueryContext);
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchingFindableWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchingFindableWindowProcessor.java
new file mode 100644
index 0000000000..a6ee8b950c
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchingFindableWindowProcessor.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.query.processor.stream.window;
+
+import io.siddhi.core.config.SiddhiQueryContext;
+import io.siddhi.core.event.state.StateEvent;
+import io.siddhi.core.event.stream.StreamEvent;
+import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.executor.VariableExpressionExecutor;
+import io.siddhi.core.table.Table;
+import io.siddhi.core.util.collection.operator.CompiledCondition;
+import io.siddhi.core.util.collection.operator.MatchingMetaInfoHolder;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.query.api.expression.Expression;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Window to process events as batches while supporting event search
+ *
+ * @param <S> current state of the processor
+ */
+public abstract class BatchingFindableWindowProcessor<S extends State> extends BatchingWindowProcessor<S>
+        implements FindableProcessor {
+
+    @Override
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
+        S state = stateHolder.getState();
+        try {
+            return compileCondition(condition, matchingMetaInfoHolder, variableExpressionExecutors, tableMap,
+                    state, siddhiQueryContext);
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    @Override
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
+        S state = stateHolder.getState();
+        try {
+            return find(matchingEvent, compiledCondition, streamEventClonerHolder.getStreamEventCloner(),
+                    state);
+        } finally {
+            stateHolder.returnState(state);
+        }
+
+    }
+
+    /**
+     * To construct a finder having the capability of finding events at the processor that corresponds to the incoming
+     * matchingEvent and the given matching expression logic.
+     *
+     * @param condition                   the matching condition
+     * @param matchingMetaInfoHolder      the meta structure of the incoming matchingEvent
+     * @param variableExpressionExecutors the list of variable ExpressionExecutors already created
+     * @param tableMap                    map of event tables
+     * @param state                       current query state
+     * @param siddhiQueryContext          current siddhi query context
+     * @return compiled Condition having the capability of matching events against the incoming matchingEvent
+     */
+    public abstract CompiledCondition compileCondition(Expression condition,
+                                                       MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                                       List<VariableExpressionExecutor> variableExpressionExecutors,
+                                                       Map<String, Table> tableMap, S state,
+                                                       SiddhiQueryContext siddhiQueryContext);
+
+    /**
+     * To find events from the processor event pool, that the matches the matchingEvent based on finder logic.
+     *
+     * @param matchingEvent     the event to be matched with the events at the processor
+     * @param compiledCondition the execution element responsible for matching the corresponding events that matches
+     *                          the matchingEvent based on pool of events at Processor
+     * @param streamEventCloner stream event cloner
+     * @param state             current query state  @return the matched events
+     */
+    public abstract StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                                     StreamEventCloner streamEventCloner, S state);
+
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchingWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchingWindowProcessor.java
index d4f71acb7f..89056159f2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchingWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchingWindowProcessor.java
@@ -23,30 +23,31 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.AbstractDefinition;
-import io.siddhi.query.api.definition.Attribute;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Performs event processing in a tumbling manner
+ *
+ * @param <S> current state of the processor
  */
-public abstract class BatchingWindowProcessor extends WindowProcessor {
+public abstract class BatchingWindowProcessor<S extends State> extends WindowProcessor<S> {
 
     @Override
-    protected List<Attribute> init(MetaStreamEvent metaStreamEvent,
-                                   AbstractDefinition inputDefinition,
-                                   ExpressionExecutor[] attributeExpressionExecutors,
-                                   ConfigReader configReader,
-                                   boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
-        init(attributeExpressionExecutors, configReader, outputExpectsExpiredEvents, siddhiQueryContext);
-        return new ArrayList<Attribute>(0);
+    protected StateFactory<S> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
+                                   ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                   StreamEventClonerHolder streamEventClonerHolder,
+                                   boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                   SiddhiQueryContext siddhiQueryContext) {
+        return init(attributeExpressionExecutors, configReader, streamEventClonerHolder,
+                outputExpectsExpiredEvents, findToBeExecuted, siddhiQueryContext);
     }
 
     /**
@@ -54,17 +55,23 @@ protected List<Attribute> init(MetaStreamEvent metaStreamEvent,
      *
      * @param attributeExpressionExecutors the executors of each function parameters
      * @param configReader                 the config reader of window
+     * @param streamEventClonerHolder      stream event cloner holder
      * @param outputExpectsExpiredEvents   is expired events sent as output
+     * @param findToBeExecuted             find operation will be performed
      * @param siddhiQueryContext           the context of the siddhi query
      */
-    protected abstract void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                                 boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext);
+    protected abstract StateFactory<S> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                            ConfigReader configReader,
+                                            StreamEventClonerHolder streamEventClonerHolder,
+                                            boolean outputExpectsExpiredEvents,
+                                            boolean findToBeExecuted, SiddhiQueryContext siddhiQueryContext);
 
     @Override
     protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater) {
+                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater,
+                                     S state) {
         streamEventChunk.reset();
-        process(streamEventChunk, nextProcessor, streamEventCloner);
+        process(streamEventChunk, nextProcessor, streamEventCloner, state);
     }
 
     /**
@@ -73,9 +80,10 @@ protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk
      * @param streamEventChunk  the stream event chunk that need to be processed
      * @param nextProcessor     the next processor to which the success events need to be passed
      * @param streamEventCloner helps to clone the incoming event for local storage or modification
+     * @param state             current state of the processor
      */
     protected abstract void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                    StreamEventCloner streamEventCloner);
+                                    StreamEventCloner streamEventCloner, S state);
 
     @Override
     public ProcessingMode getProcessingMode() {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
index e291ccaa22..79fd4b152e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
@@ -21,15 +21,21 @@
 import io.siddhi.annotation.Extension;
 import io.siddhi.annotation.Parameter;
 import io.siddhi.annotation.util.DataType;
+import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.ExceptionUtil;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 import org.quartz.CronScheduleBuilder;
 import org.quartz.Job;
@@ -87,34 +93,39 @@
                 )
         }
 )
-public class CronWindowProcessor extends BatchingWindowProcessor implements Job {
+//todo fix support find and optimize data storage
+public class CronWindowProcessor extends BatchingWindowProcessor<CronWindowProcessor.WindowState> implements Job {
     private static final Logger log = Logger.getLogger(CronWindowProcessor.class);
     private final String jobGroup = "CronWindowGroup";
-    private ComplexEventChunk<StreamEvent> currentEventChunk = new ComplexEventChunk<StreamEvent>(false);
-    private ComplexEventChunk<StreamEvent> expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
-    private SiddhiQueryContext siddhiQueryContext;
     private Scheduler scheduler;
     private String jobName;
     private String cronString;
-
+    private StreamEventClonerHolder streamEventClonerHolder;
+    private String id;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader, boolean
-            outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
-        this.siddhiQueryContext = siddhiQueryContext;
+    protected StateFactory<WindowState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                             ConfigReader configReader,
+                                             StreamEventClonerHolder streamEventClonerHolder,
+                                             boolean outputExpectsExpiredEvents,
+                                             boolean findToBeExecuted,
+                                             SiddhiQueryContext siddhiQueryContext) {
+        this.streamEventClonerHolder = streamEventClonerHolder;
+        this.id = siddhiQueryContext.getName() + "_" + siddhiQueryContext.generateNewId();
         if (attributeExpressionExecutors != null) {
             cronString = (String) (((ConstantExpressionExecutor) attributeExpressionExecutors[0]).getValue());
         }
+        return () -> new WindowState(streamEventClonerHolder);
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
-        synchronized (this) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
+        synchronized (state) {
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
                 StreamEvent clonedStreamEvent = streamEventCloner.copyStreamEvent(streamEvent);
-                currentEventChunk.add(clonedStreamEvent);
+                state.currentEventQueue.add(clonedStreamEvent);
                 streamEventChunk.remove();
             }
         }
@@ -122,7 +133,7 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
 
     @Override
     public void start() {
-        scheduleCronJob(cronString, elementId);
+        scheduleCronJob(cronString);
     }
 
     @Override
@@ -137,28 +148,11 @@ public void stop() {
         }
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("CurrentEventChunk", currentEventChunk.getFirst());
-        state.put("ExpiredEventChunk", expiredEventChunk.getFirst());
-        return state;
-    }
-
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        currentEventChunk.clear();
-        currentEventChunk.add((StreamEvent) state.get("CurrentEventChunk"));
-        expiredEventChunk.clear();
-        expiredEventChunk.add((StreamEvent) state.get("ExpiredEventChunk"));
-    }
-
-    private void scheduleCronJob(String cronString, String elementId) {
+    private void scheduleCronJob(String cronString) {
         try {
             SchedulerFactory schedFact = new StdSchedulerFactory();
             scheduler = schedFact.getScheduler();
-            jobName = "EventRemoverJob_" + elementId;
+            jobName = siddhiQueryContext.getName() + "_EventRemoverJob_" + siddhiQueryContext.generateNewId();
             JobKey jobKey = new JobKey(jobName, jobGroup);
 
             if (scheduler.checkExists(jobKey)) {
@@ -174,7 +168,7 @@ private void scheduleCronJob(String cronString, String elementId) {
                     .build();
 
             Trigger trigger = org.quartz.TriggerBuilder.newTrigger()
-                    .withIdentity("EventRemoverTrigger_" + elementId, jobGroup)
+                    .withIdentity("EventRemoverTrigger_" + id, jobGroup)
                     .withSchedule(CronScheduleBuilder.cronSchedule(cronString))
                     .build();
 
@@ -187,32 +181,46 @@ private void scheduleCronJob(String cronString, String elementId) {
 
     public void dispatchEvents() {
 
-        ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<StreamEvent>(false);
-        synchronized (this) {
-            if (currentEventChunk.getFirst() != null) {
-                long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
-                while (expiredEventChunk.hasNext()) {
-                    StreamEvent expiredEvent = expiredEventChunk.next();
-                    expiredEvent.setTimestamp(currentTime);
-                }
-                if (expiredEventChunk.getFirst() != null) {
-                    streamEventChunk.add(expiredEventChunk.getFirst());
+        Map<String, WindowState> states = stateHolder.getAllStates();
+        try {
+            for (Map.Entry<String, WindowState> state : states.entrySet()) {
+                WindowState windowState = state.getValue();
+                ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<StreamEvent>(false);
+                synchronized (windowState) {
+                    if (windowState.currentEventQueue.getFirst() != null) {
+                        long currentTime = siddhiQueryContext.getSiddhiAppContext().
+                                getTimestampGenerator().currentTime();
+                        while (windowState.expiredEventQueue.hasNext()) {
+                            StreamEvent expiredEvent = windowState.expiredEventQueue.next();
+                            expiredEvent.setTimestamp(currentTime);
+                        }
+                        if (windowState.expiredEventQueue.getFirst() != null) {
+                            streamEventChunk.add(windowState.expiredEventQueue.getFirst());
+                        }
+                        windowState.expiredEventQueue.clear();
+                        while (windowState.currentEventQueue.hasNext()) {
+                            StreamEvent currentEvent = windowState.currentEventQueue.next();
+                            StreamEvent toExpireEvent =
+                                    streamEventClonerHolder.getStreamEventCloner().copyStreamEvent(currentEvent);
+                            toExpireEvent.setType(StreamEvent.Type.EXPIRED);
+                            windowState.expiredEventQueue.add(toExpireEvent);
+                        }
+
+                        streamEventChunk.add(windowState.currentEventQueue.getFirst());
+                        windowState.currentEventQueue.clear();
+                    }
                 }
-                expiredEventChunk.clear();
-                while (currentEventChunk.hasNext()) {
-                    StreamEvent currentEvent = currentEventChunk.next();
-                    StreamEvent toExpireEvent = streamEventCloner.copyStreamEvent(currentEvent);
-                    toExpireEvent.setType(StreamEvent.Type.EXPIRED);
-                    expiredEventChunk.add(toExpireEvent);
+                SiddhiAppContext.startPartitionFlow(state.getKey());
+                try {
+                    if (streamEventChunk.getFirst() != null) {
+                        nextProcessor.process(streamEventChunk);
+                    }
+                } finally {
+                    SiddhiAppContext.stopPartitionFlow();
                 }
-
-                streamEventChunk.add(currentEventChunk.getFirst());
-                currentEventChunk.clear();
-
             }
-        }
-        if (streamEventChunk.getFirst() != null) {
-            nextProcessor.process(streamEventChunk);
+        } finally {
+            stateHolder.returnStates(states);
         }
     }
 
@@ -227,4 +235,32 @@ public void execute(JobExecutionContext jobExecutionContext) throws JobExecution
         windowProcessor.dispatchEvents();
 
     }
+
+    class WindowState extends State {
+        private SnapshotableStreamEventQueue currentEventQueue;
+        private SnapshotableStreamEventQueue expiredEventQueue;
+
+        WindowState(StreamEventClonerHolder streamEventClonerHolder) {
+            currentEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+            expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("CurrentEventQueue", currentEventQueue.getSnapshot());
+            state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
+            return state;
+        }
+
+        public void restore(Map<String, Object> state) {
+            currentEventQueue.restore((SnapshotStateList) state.get("CurrentEventQueue"));
+            expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return expiredEventQueue.getFirst() == null && currentEventQueue.getFirst() == null;
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/DelayWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/DelayWindowProcessor.java
index 2bc79a4dfd..8af959f3db 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/DelayWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/DelayWindowProcessor.java
@@ -27,6 +27,7 @@
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
 import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -38,6 +39,7 @@
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
@@ -91,14 +93,11 @@ public class DelayWindowProcessor extends TimeWindowProcessor {
 
     private long delayInMilliSeconds;
     private SiddhiQueryContext siddhiQueryContext;
-    private SnapshotableStreamEventQueue delayedEventQueue;
-    private volatile long lastTimestamp = Long.MIN_VALUE;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         this.siddhiQueryContext = siddhiQueryContext;
-        this.delayedEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
         if (attributeExpressionExecutors.length == 1) {
             if (attributeExpressionExecutors[0] instanceof ConstantExpressionExecutor) {
                 if (attributeExpressionExecutors[0].getReturnType() == Attribute.Type.INT ||
@@ -117,23 +116,25 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             throw new SiddhiAppValidationException("Delay window should only have one parameter (<int|long|time> " +
                     "delayTime), but found " + attributeExpressionExecutors.length + " input attributes");
         }
+        return () -> new WindowState(streamEventClonerHolder);
+
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
-        synchronized (this) {
-
+                           StreamEventCloner streamEventCloner, WindowState windowState) {
+        DelayedWindowState state = ((DelayedWindowState) windowState);
+        synchronized (state) {
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
                 long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
 
-                delayedEventQueue.reset();
-                while (delayedEventQueue.hasNext()) {
-                    StreamEvent delayedEvent = delayedEventQueue.next();
+                state.delayedEventQueue.reset();
+                while (state.delayedEventQueue.hasNext()) {
+                    StreamEvent delayedEvent = state.delayedEventQueue.next();
                     long timeDiff = delayedEvent.getTimestamp() - currentTime + delayInMilliSeconds;
                     if (timeDiff <= 0) {
-                        delayedEventQueue.remove();
+                        state.delayedEventQueue.remove();
                         //insert delayed event before the current event to stream chunk
                         delayedEvent.setTimestamp(currentTime);
                         streamEventChunk.insertBeforeCurrent(delayedEvent);
@@ -143,17 +144,17 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                 }
 
                 if (streamEvent.getType() == StreamEvent.Type.CURRENT) {
-                    this.delayedEventQueue.add(streamEvent);
+                    state.delayedEventQueue.add(streamEvent);
 
-                    if (lastTimestamp < streamEvent.getTimestamp()) {
+                    if (state.lastTimestamp < streamEvent.getTimestamp()) {
                         getScheduler().notifyAt(streamEvent.getTimestamp() + delayInMilliSeconds);
-                        lastTimestamp = streamEvent.getTimestamp();
+                        state.lastTimestamp = streamEvent.getTimestamp();
                     }
                 }
                 //current events are not processed, so remove the current event from the stream chunk
                 streamEventChunk.remove();
             }
-            delayedEventQueue.reset();
+            state.delayedEventQueue.reset();
         }
         //only pass to next processor if there are any events in the stream chunk
         if (streamEventChunk.getFirst() != null) {
@@ -162,27 +163,45 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
     }
 
     @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, delayedEventQueue, streamEventCloner);
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, ((DelayedWindowState) state).delayedEventQueue,
+                streamEventCloner);
     }
 
     @Override
     public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
                                               List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(delayedEventQueue, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap, siddhiQueryContext);
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(((DelayedWindowState) state).delayedEventQueue,
+                condition, matchingMetaInfoHolder, variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("DelayedEventQueue", delayedEventQueue.getSnapshot());
-        return state;
-    }
+    class DelayedWindowState extends WindowState {
+        private SnapshotableStreamEventQueue delayedEventQueue;
+        private volatile long lastTimestamp = Long.MIN_VALUE;
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        delayedEventQueue.restore((SnapshotStateList) state.get("DelayedEventQueue"));
+        DelayedWindowState(StreamEventClonerHolder streamEventClonerHolder) {
+            super(streamEventClonerHolder);
+            this.delayedEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("DelayedEventQueue", delayedEventQueue.getSnapshot());
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            delayedEventQueue.restore((SnapshotStateList) state.get("DelayedEventQueue"));
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return delayedEventQueue.getFirst() == null;
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
index c094957ff8..369d41b5cf 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
@@ -28,6 +28,7 @@
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -40,6 +41,8 @@
 import io.siddhi.core.util.collection.operator.Operator;
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
@@ -80,6 +83,7 @@
                         optional = true,
                         defaultValue = "System waits till an event from next batch arrives to flush current batch")
         },
+
         examples = {
                 @Example(
                         syntax = "define window cseEventWindow (symbol string, price float, volume int) " +
@@ -109,34 +113,28 @@
                 )
         }
 )
-public class ExternalTimeBatchWindowProcessor extends BatchingWindowProcessor
-        implements SchedulingProcessor, FindableProcessor {
-    private ComplexEventChunk<StreamEvent> currentEventChunk = new ComplexEventChunk<StreamEvent>(false);
-    private ComplexEventChunk<StreamEvent> expiredEventChunk = null;
-    private StreamEvent resetEvent = null;
+public class ExternalTimeBatchWindowProcessor
+        extends BatchingFindableWindowProcessor<ExternalTimeBatchWindowProcessor.WindowState>
+        implements SchedulingProcessor {
     private VariableExpressionExecutor timestampExpressionExecutor;
     private ExpressionExecutor startTimeAsVariable;
     private long timeToKeep;
-    private long endTime = -1;
-    private long startTime = 0;
     private boolean isStartTimeEnabled = false;
     private long schedulerTimeout = 0;
     private Scheduler scheduler;
-    private long lastScheduledTime;
-    private long lastCurrentEventTime;
-    private boolean flushed = false;
-    private boolean storeExpiredEvents = false;
+    private boolean findToBeExecuted = false;
     private boolean replaceTimestampWithBatchEndTime = false;
     private boolean outputExpectsExpiredEvents;
+    private long commonStartTime = 0;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader, boolean
-            outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                StreamEventClonerHolder streamEventClonerHolder,
+                                boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                SiddhiQueryContext siddhiQueryContext) {
         this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
-        if (outputExpectsExpiredEvents) {
-            this.expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
-            this.storeExpiredEvents = true;
-        }
+        this.findToBeExecuted = findToBeExecuted;
+
         if (attributeExpressionExecutors.length >= 2 && attributeExpressionExecutors.length <= 5) {
 
             if (!(attributeExpressionExecutors[0] instanceof VariableExpressionExecutor)) {
@@ -163,10 +161,10 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                 isStartTimeEnabled = true;
                 if ((attributeExpressionExecutors[2] instanceof ConstantExpressionExecutor)) {
                     if (attributeExpressionExecutors[2].getReturnType() == Attribute.Type.INT) {
-                        startTime = Integer.parseInt(String.valueOf(((ConstantExpressionExecutor)
+                        commonStartTime = Integer.parseInt(String.valueOf(((ConstantExpressionExecutor)
                                 attributeExpressionExecutors[2]).getValue()));
                     } else if (attributeExpressionExecutors[2].getReturnType() == Attribute.Type.LONG) {
-                        startTime = Long.parseLong(String.valueOf(((ConstantExpressionExecutor)
+                        commonStartTime = Long.parseLong(String.valueOf(((ConstantExpressionExecutor)
                                 attributeExpressionExecutors[2]).getValue()));
                     } else {
                         throw new SiddhiAppValidationException("ExternalTimeBatch window's 3rd parameter " +
@@ -212,11 +210,8 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                     "timeout, <bool> replaceTimestampWithBatchEndTime), but found " + attributeExpressionExecutors
                     .length + " input attributes");
         }
-        if (schedulerTimeout > 0) {
-            if (expiredEventChunk == null) {
-                this.expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
-            }
-        }
+        return () -> new WindowState(streamEventClonerHolder, outputExpectsExpiredEvents,
+                schedulerTimeout, commonStartTime);
     }
 
     /**
@@ -227,7 +222,7 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
      */
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
 
         // event incoming trigger process. No events means no action
         if (streamEventChunk.getFirst() == null) {
@@ -235,8 +230,8 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
         }
 
         List<ComplexEventChunk<StreamEvent>> complexEventChunks = new ArrayList<ComplexEventChunk<StreamEvent>>();
-        synchronized (this) {
-            initTiming(streamEventChunk.getFirst());
+        synchronized (state) {
+            initTiming(streamEventChunk.getFirst(), state);
 
             StreamEvent nextStreamEvent = streamEventChunk.getFirst();
             while (nextStreamEvent != null) {
@@ -245,21 +240,23 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                 nextStreamEvent = nextStreamEvent.getNext();
 
                 if (currStreamEvent.getType() == ComplexEvent.Type.TIMER) {
-                    if (lastScheduledTime <= currStreamEvent.getTimestamp()) {
+                    if (state.lastScheduledTime <= currStreamEvent.getTimestamp()) {
                         // implies that there have not been any more events after this schedule has been done.
-                        if (!flushed) {
-                            flushToOutputChunk(streamEventCloner, complexEventChunks, lastCurrentEventTime, true);
-                            flushed = true;
+                        if (!state.flushed) {
+                            flushToOutputChunk(streamEventCloner, complexEventChunks, state.lastCurrentEventTime,
+                                    true, state);
+                            state.flushed = true;
                         } else {
-                            if (currentEventChunk.getFirst() != null) {
-                                appendToOutputChunk(streamEventCloner, complexEventChunks, lastCurrentEventTime, true);
+                            if (state.currentEventChunk.getFirst() != null) {
+                                appendToOutputChunk(streamEventCloner, complexEventChunks, state.lastCurrentEventTime,
+                                        true, state);
                             }
                         }
 
                         // rescheduling to emit the current batch after expiring it if no further events arrive.
-                        lastScheduledTime = siddhiQueryContext.getSiddhiAppContext().
+                        state.lastScheduledTime = siddhiQueryContext.getSiddhiAppContext().
                                 getTimestampGenerator().currentTime() + schedulerTimeout;
-                        scheduler.notifyAt(lastScheduledTime);
+                        scheduler.notifyAt(state.lastScheduledTime);
                     }
                     continue;
                 } else if (currStreamEvent.getType() != ComplexEvent.Type.CURRENT) {
@@ -267,27 +264,29 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                 }
 
                 long currentEventTime = (Long) timestampExpressionExecutor.execute(currStreamEvent);
-                if (lastCurrentEventTime < currentEventTime) {
-                    lastCurrentEventTime = currentEventTime;
+                if (state.lastCurrentEventTime < currentEventTime) {
+                    state.lastCurrentEventTime = currentEventTime;
                 }
 
-                if (currentEventTime < endTime) {
-                    cloneAppend(streamEventCloner, currStreamEvent);
+                if (currentEventTime < state.endTime) {
+                    cloneAppend(streamEventCloner, currStreamEvent, state);
                 } else {
-                    if (flushed) {
-                        appendToOutputChunk(streamEventCloner, complexEventChunks, lastCurrentEventTime, false);
-                        flushed = false;
+                    if (state.flushed) {
+                        appendToOutputChunk(streamEventCloner, complexEventChunks, state.lastCurrentEventTime,
+                                false, state);
+                        state.flushed = false;
                     } else {
-                        flushToOutputChunk(streamEventCloner, complexEventChunks, lastCurrentEventTime, false);
+                        flushToOutputChunk(streamEventCloner, complexEventChunks, state.lastCurrentEventTime,
+                                false, state);
                     }
                     // update timestamp, call next processor
-                    endTime = findEndTime(lastCurrentEventTime, startTime, timeToKeep);
-                    cloneAppend(streamEventCloner, currStreamEvent);
+                    state.endTime = findEndTime(state.lastCurrentEventTime, state.startTime, timeToKeep);
+                    cloneAppend(streamEventCloner, currStreamEvent, state);
                     // triggering the last batch expiration.
                     if (schedulerTimeout > 0) {
-                        lastScheduledTime = siddhiQueryContext.getSiddhiAppContext().
+                        state.lastScheduledTime = siddhiQueryContext.getSiddhiAppContext().
                                 getTimestampGenerator().currentTime() + schedulerTimeout;
-                        scheduler.notifyAt(lastScheduledTime);
+                        scheduler.notifyAt(state.lastScheduledTime);
                     }
                 }
             }
@@ -297,90 +296,89 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
         }
     }
 
-    private void initTiming(StreamEvent firstStreamEvent) {
+    private void initTiming(StreamEvent firstStreamEvent, WindowState state) {
         // for window beginning, if window is empty, set lastSendTime to incomingChunk first.
-        if (endTime < 0) {
+        if (state.endTime < 0) {
             if (isStartTimeEnabled) {
                 if (startTimeAsVariable == null) {
-                    endTime = findEndTime((Long) timestampExpressionExecutor.execute(firstStreamEvent), startTime,
-                            timeToKeep);
+                    state.endTime = findEndTime((Long) timestampExpressionExecutor.execute(firstStreamEvent),
+                            state.startTime, timeToKeep);
                 } else {
-                    startTime = (Long) startTimeAsVariable.execute(firstStreamEvent);
-                    endTime = startTime + timeToKeep;
+                    state.startTime = (Long) startTimeAsVariable.execute(firstStreamEvent);
+                    state.endTime = state.startTime + timeToKeep;
                 }
             } else {
-                startTime = (Long) timestampExpressionExecutor.execute(firstStreamEvent);
-                endTime = startTime + timeToKeep;
+                state.startTime = (Long) timestampExpressionExecutor.execute(firstStreamEvent);
+                state.endTime = state.startTime + timeToKeep;
             }
             if (schedulerTimeout > 0) {
-                lastScheduledTime = siddhiQueryContext.getSiddhiAppContext().
+                state.lastScheduledTime = siddhiQueryContext.getSiddhiAppContext().
                         getTimestampGenerator().currentTime() + schedulerTimeout;
-                scheduler.notifyAt(lastScheduledTime);
+                scheduler.notifyAt(state.lastScheduledTime);
             }
         }
     }
 
-    private void flushToOutputChunk(StreamEventCloner streamEventCloner, List<ComplexEventChunk<StreamEvent>>
-            complexEventChunks,
-                                    long currentTime, boolean preserveCurrentEvents) {
+    private void flushToOutputChunk(StreamEventCloner streamEventCloner,
+                                    List<ComplexEventChunk<StreamEvent>> complexEventChunks,
+                                    long currentTime, boolean preserveCurrentEvents, WindowState state) {
 
         ComplexEventChunk<StreamEvent> newEventChunk = new ComplexEventChunk<StreamEvent>(true);
         if (outputExpectsExpiredEvents) {
-            if (expiredEventChunk.getFirst() != null) {
+            if (state.expiredEventChunk.getFirst() != null) {
                 // mark the timestamp for the expiredType event
-                expiredEventChunk.reset();
-                while (expiredEventChunk.hasNext()) {
-                    StreamEvent expiredEvent = expiredEventChunk.next();
+                state.expiredEventChunk.reset();
+                while (state.expiredEventChunk.hasNext()) {
+                    StreamEvent expiredEvent = state.expiredEventChunk.next();
                     expiredEvent.setTimestamp(currentTime);
                 }
                 // add expired event to newEventChunk.
-                newEventChunk.add(expiredEventChunk.getFirst());
+                newEventChunk.add(state.expiredEventChunk.getFirst());
             }
         }
-        if (expiredEventChunk != null) {
-            expiredEventChunk.clear();
+        if (state.expiredEventChunk != null) {
+            state.expiredEventChunk.clear();
         }
 
-        if (currentEventChunk.getFirst() != null) {
+        if (state.currentEventChunk.getFirst() != null) {
 
             // add reset event in front of current events
-            resetEvent.setTimestamp(currentTime);
-            newEventChunk.add(resetEvent);
-            resetEvent = null;
+            state.resetEvent.setTimestamp(currentTime);
+            newEventChunk.add(state.resetEvent);
+            state.resetEvent = null;
 
             // move to expired events
-            if (preserveCurrentEvents || storeExpiredEvents) {
-                currentEventChunk.reset();
-                while (currentEventChunk.hasNext()) {
-                    StreamEvent currentEvent = currentEventChunk.next();
+            if (preserveCurrentEvents || state.expiredEventChunk != null) {
+                state.currentEventChunk.reset();
+                while (state.currentEventChunk.hasNext()) {
+                    StreamEvent currentEvent = state.currentEventChunk.next();
                     StreamEvent toExpireEvent = streamEventCloner.copyStreamEvent(currentEvent);
                     toExpireEvent.setType(StreamEvent.Type.EXPIRED);
-                    expiredEventChunk.add(toExpireEvent);
+                    state.expiredEventChunk.add(toExpireEvent);
                 }
             }
 
             // add current event chunk to next processor
-            newEventChunk.add(currentEventChunk.getFirst());
+            newEventChunk.add(state.currentEventChunk.getFirst());
         }
-        currentEventChunk.clear();
+        state.currentEventChunk.clear();
 
         if (newEventChunk.getFirst() != null) {
             complexEventChunks.add(newEventChunk);
         }
     }
 
-    private void appendToOutputChunk(StreamEventCloner streamEventCloner, List<ComplexEventChunk<StreamEvent>>
-            complexEventChunks,
-                                     long currentTime, boolean preserveCurrentEvents) {
+    private void appendToOutputChunk(StreamEventCloner streamEventCloner,
+                                     List<ComplexEventChunk<StreamEvent>> complexEventChunks,
+                                     long currentTime, boolean preserveCurrentEvents, WindowState state) {
         ComplexEventChunk<StreamEvent> newEventChunk = new ComplexEventChunk<StreamEvent>(true);
         ComplexEventChunk<StreamEvent> sentEventChunk = new ComplexEventChunk<StreamEvent>(true);
-        if (currentEventChunk.getFirst() != null) {
-
-            if (expiredEventChunk.getFirst() != null) {
+        if (state.currentEventChunk.getFirst() != null) {
+            if (state.expiredEventChunk != null && state.expiredEventChunk.getFirst() != null) {
                 // mark the timestamp for the expiredType event
-                expiredEventChunk.reset();
-                while (expiredEventChunk.hasNext()) {
-                    StreamEvent expiredEvent = expiredEventChunk.next();
+                state.expiredEventChunk.reset();
+                while (state.expiredEventChunk.hasNext()) {
+                    StreamEvent expiredEvent = state.expiredEventChunk.next();
 
                     if (outputExpectsExpiredEvents) {
                         // add expired event to newEventChunk.
@@ -396,7 +394,7 @@ private void appendToOutputChunk(StreamEventCloner streamEventCloner, List<Compl
             }
 
             // add reset event in front of current events
-            StreamEvent toResetEvent = streamEventCloner.copyStreamEvent(resetEvent);
+            StreamEvent toResetEvent = streamEventCloner.copyStreamEvent(state.resetEvent);
             toResetEvent.setTimestamp(currentTime);
             newEventChunk.add(toResetEvent);
 
@@ -404,21 +402,21 @@ private void appendToOutputChunk(StreamEventCloner streamEventCloner, List<Compl
             newEventChunk.add(sentEventChunk.getFirst());
 
             // move to expired events
-            if (preserveCurrentEvents || storeExpiredEvents) {
-                currentEventChunk.reset();
-                while (currentEventChunk.hasNext()) {
-                    StreamEvent currentEvent = currentEventChunk.next();
+            if (preserveCurrentEvents || state.expiredEventChunk != null) {
+                state.currentEventChunk.reset();
+                while (state.currentEventChunk.hasNext()) {
+                    StreamEvent currentEvent = state.currentEventChunk.next();
                     StreamEvent toExpireEvent = streamEventCloner.copyStreamEvent(currentEvent);
                     toExpireEvent.setType(StreamEvent.Type.EXPIRED);
-                    expiredEventChunk.add(toExpireEvent);
+                    state.expiredEventChunk.add(toExpireEvent);
                 }
             }
 
             // add current event chunk to next processor
-            newEventChunk.add(currentEventChunk.getFirst());
+            newEventChunk.add(state.currentEventChunk.getFirst());
 
         }
-        currentEventChunk.clear();
+        state.currentEventChunk.clear();
 
         if (newEventChunk.getFirst() != null) {
             complexEventChunks.add(newEventChunk);
@@ -431,15 +429,15 @@ private long findEndTime(long currentTime, long startTime, long timeToKeep) {
         return (currentTime + (timeToKeep - elapsedTimeSinceLastEmit));
     }
 
-    private void cloneAppend(StreamEventCloner streamEventCloner, StreamEvent currStreamEvent) {
+    private void cloneAppend(StreamEventCloner streamEventCloner, StreamEvent currStreamEvent, WindowState state) {
         StreamEvent clonedStreamEvent = streamEventCloner.copyStreamEvent(currStreamEvent);
         if (replaceTimestampWithBatchEndTime) {
-            clonedStreamEvent.setAttribute(endTime, timestampExpressionExecutor.getPosition());
+            clonedStreamEvent.setAttribute(state.endTime, timestampExpressionExecutor.getPosition());
         }
-        currentEventChunk.add(clonedStreamEvent);
-        if (resetEvent == null) {
-            resetEvent = streamEventCloner.copyStreamEvent(currStreamEvent);
-            resetEvent.setType(ComplexEvent.Type.RESET);
+        state.currentEventChunk.add(clonedStreamEvent);
+        if (state.resetEvent == null) {
+            state.resetEvent = streamEventCloner.copyStreamEvent(currStreamEvent);
+            state.resetEvent.setType(ComplexEvent.Type.RESET);
         }
     }
 
@@ -452,60 +450,19 @@ public void stop() {
     }
 
     @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("StartTime", startTime);
-            state.put("EndTime", endTime);
-            state.put("LastScheduledTime", lastScheduledTime);
-            state.put("LastCurrentEventTime", lastCurrentEventTime);
-            state.put("CurrentEventChunk", currentEventChunk.getFirst());
-            state.put("ExpiredEventChunk", expiredEventChunk != null ? expiredEventChunk.getFirst() : null);
-            state.put("ResetEvent", resetEvent);
-            state.put("Flushed", flushed);
-        }
-        return state;
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventChunk, condition, matchingMetaInfoHolder,
+                variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
-
     @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        startTime = (long) state.get("StartTime");
-        endTime = (long) state.get("EndTime");
-        lastScheduledTime = (long) state.get("LastScheduledTime");
-        lastCurrentEventTime = (long) state.get("LastCurrentEventTime");
-        currentEventChunk.clear();
-        currentEventChunk.add((StreamEvent) state.get("CurrentEventChunk"));
-        if (expiredEventChunk != null) {
-            expiredEventChunk.clear();
-            expiredEventChunk.add((StreamEvent) state.get("ExpiredEventChunk"));
-        } else {
-            if (outputExpectsExpiredEvents) {
-                expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
-            }
-            if (schedulerTimeout > 0) {
-                expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
-            }
-        }
-        resetEvent = (StreamEvent) state.get("ResetEvent");
-        flushed = (boolean) state.get("Flushed");
-
-    }
-
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventChunk, streamEventCloner);
-    }
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventChunk, streamEventCloner);
 
-    @Override
-    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
-                                              List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        if (expiredEventChunk == null) {
-            expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
-            storeExpiredEvents = true;
-        }
-        return OperatorParser.constructOperator(expiredEventChunk, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
     @Override
@@ -517,4 +474,77 @@ public Scheduler getScheduler() {
     public void setScheduler(Scheduler scheduler) {
         this.scheduler = scheduler;
     }
+
+    class WindowState extends State {
+
+        private ComplexEventChunk<StreamEvent> currentEventChunk = new ComplexEventChunk<StreamEvent>(false);
+        private ComplexEventChunk<StreamEvent> expiredEventChunk = null;
+        private StreamEvent resetEvent = null;
+        private long endTime = -1;
+        private long startTime = 0;
+        private long lastScheduledTime;
+        private long lastCurrentEventTime;
+        private boolean flushed = false;
+
+
+        public WindowState(StreamEventClonerHolder streamEventClonerHolder,
+                           boolean outputExpectsExpiredEvents, long schedulerTimeout, long startTime) {
+            this.startTime = startTime;
+            if (outputExpectsExpiredEvents || findToBeExecuted) {
+                this.expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
+            }
+            if (schedulerTimeout > 0) {
+                if (expiredEventChunk == null) {
+                    this.expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
+                }
+            }
+        }
+
+
+        @Override
+        public boolean canDestroy() {
+            return currentEventChunk.getFirst() == null &&
+                    (expiredEventChunk == null || expiredEventChunk.getFirst() == null) &&
+                    resetEvent == null && flushed;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("StartTime", startTime);
+                state.put("EndTime", endTime);
+                state.put("LastScheduledTime", lastScheduledTime);
+                state.put("LastCurrentEventTime", lastCurrentEventTime);
+                state.put("CurrentEventChunk", currentEventChunk.getFirst());
+                state.put("ExpiredEventChunk", expiredEventChunk != null ? expiredEventChunk.getFirst() : null);
+                state.put("ResetEvent", resetEvent);
+                state.put("Flushed", flushed);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            startTime = (long) state.get("StartTime");
+            endTime = (long) state.get("EndTime");
+            lastScheduledTime = (long) state.get("LastScheduledTime");
+            lastCurrentEventTime = (long) state.get("LastCurrentEventTime");
+            currentEventChunk.clear();
+            currentEventChunk.add((StreamEvent) state.get("CurrentEventChunk"));
+            if (expiredEventChunk != null) {
+                expiredEventChunk.clear();
+                expiredEventChunk.add((StreamEvent) state.get("ExpiredEventChunk"));
+            } else {
+                if (outputExpectsExpiredEvents || findToBeExecuted) {
+                    expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
+                }
+                if (schedulerTimeout > 0) {
+                    expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
+                }
+            }
+            resetEvent = (StreamEvent) state.get("ResetEvent");
+            flushed = (boolean) state.get("Flushed");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeWindowProcessor.java
index 45211bcce3..261dc6d5a1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeWindowProcessor.java
@@ -39,6 +39,8 @@
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
@@ -81,16 +83,15 @@
                         "from the eventTime and output expired events."
         )
 )
-public class ExternalTimeWindowProcessor extends SlidingWindowProcessor implements FindableProcessor {
+public class ExternalTimeWindowProcessor
+        extends SlidingFindableWindowProcessor<ExternalTimeWindowProcessor.WindowState> {
     private static final Logger log = Logger.getLogger(ExternalTimeWindowProcessor.class);
     private long timeToKeep;
-    private SnapshotableStreamEventQueue expiredEventQueue;
     private VariableExpressionExecutor timeStampVariableExpressionExecutor;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
-        this.expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+    protected StateFactory<WindowState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                             ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length == 2) {
             if (attributeExpressionExecutors[1].getReturnType() == Attribute.Type.INT) {
                 timeToKeep = Integer.parseInt(String.valueOf(((ConstantExpressionExecutor)
@@ -113,12 +114,13 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                     "timeStamp, <int|long|time> windowTime), but found " + attributeExpressionExecutors.length + " " +
                     "input attributes");
         }
+        return () -> new WindowState();
     }
 
     @Override
-    protected synchronized void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                        StreamEventCloner streamEventCloner) {
-        synchronized (this) {
+    protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
+                           StreamEventCloner streamEventCloner, WindowState state) {
+        synchronized (state) {
             while (streamEventChunk.hasNext()) {
 
                 StreamEvent streamEvent = streamEventChunk.next();
@@ -129,25 +131,25 @@ protected synchronized void process(ComplexEventChunk<StreamEvent> streamEventCh
 
                 // reset expiredEventQueue to make sure all of the expired events get removed,
                 // otherwise lastReturned.next will always return null and here while check is always false
-                expiredEventQueue.reset();
-                while (expiredEventQueue.hasNext()) {
-                    StreamEvent expiredEvent = expiredEventQueue.next();
+                state.expiredEventQueue.reset();
+                while (state.expiredEventQueue.hasNext()) {
+                    StreamEvent expiredEvent = state.expiredEventQueue.next();
                     long expiredEventTime = (Long) timeStampVariableExpressionExecutor.execute(expiredEvent);
                     long timeDiff = expiredEventTime - currentTime + timeToKeep;
                     if (timeDiff <= 0) {
-                        expiredEventQueue.remove();
+                        state.expiredEventQueue.remove();
                         expiredEvent.setTimestamp(currentTime);
                         streamEventChunk.insertBeforeCurrent(expiredEvent);
                     } else {
-                        expiredEventQueue.reset();
+                        state.expiredEventQueue.reset();
                         break;
                     }
                 }
 
                 if (streamEvent.getType() == StreamEvent.Type.CURRENT) {
-                    this.expiredEventQueue.add(clonedEvent);
+                    state.expiredEventQueue.add(clonedEvent);
                 }
-                expiredEventQueue.reset();
+                state.expiredEventQueue.reset();
             }
         }
         nextProcessor.process(streamEventChunk);
@@ -164,28 +166,40 @@ public void stop() {
     }
 
     @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
-        return state;
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventQueue, condition, matchingMetaInfoHolder,
+                variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
     @Override
-    public void restoreState(Map<String, Object> state) {
-        expiredEventQueue.clear();
-        expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventQueue, streamEventCloner);
     }
 
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventQueue, streamEventCloner);
-    }
+    class WindowState extends State {
+        private SnapshotableStreamEventQueue expiredEventQueue =
+                new SnapshotableStreamEventQueue(streamEventClonerHolder);
 
-    @Override
-    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
-                                              List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(expiredEventQueue, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap, siddhiQueryContext);
+        @Override
+        public boolean canDestroy() {
+            return expiredEventQueue.getFirst() == null;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            expiredEventQueue.clear();
+            expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/FrequentWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/FrequentWindowProcessor.java
index ad1141f579..c041a831c5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/FrequentWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/FrequentWindowProcessor.java
@@ -37,6 +37,8 @@
 import io.siddhi.core.util.collection.operator.Operator;
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.expression.Expression;
 
 import java.util.ArrayList;
@@ -85,27 +87,28 @@
         }
 )
 @Deprecated
-public class FrequentWindowProcessor extends SlidingWindowProcessor implements FindableProcessor {
-    private ConcurrentHashMap<String, Integer> countMap = new ConcurrentHashMap<String, Integer>();
-    private ConcurrentHashMap<String, StreamEvent> map = new ConcurrentHashMap<String, StreamEvent>();
+public class FrequentWindowProcessor extends SlidingFindableWindowProcessor<FrequentWindowProcessor.WindowState> {
     private VariableExpressionExecutor[] variableExpressionExecutors;
 
     private int mostFrequentCount;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<WindowState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                             ConfigReader configReader,
+                                             SiddhiQueryContext siddhiQueryContext) {
         mostFrequentCount = Integer.parseInt(String.valueOf(((ConstantExpressionExecutor)
                 attributeExpressionExecutors[0]).getValue()));
         variableExpressionExecutors = new VariableExpressionExecutor[attributeExpressionExecutors.length - 1];
         for (int i = 1; i < attributeExpressionExecutors.length; i++) {
             variableExpressionExecutors[i - 1] = (VariableExpressionExecutor) attributeExpressionExecutors[i];
         }
+        return () -> new WindowState();
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
+
         synchronized (this) {
             StreamEvent streamEvent = streamEventChunk.getFirst();
             streamEventChunk.clear();
@@ -118,39 +121,39 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                 clonedEvent.setType(StreamEvent.Type.EXPIRED);
 
                 String key = generateKey(streamEvent);
-                StreamEvent oldEvent = map.put(key, clonedEvent);
+                StreamEvent oldEvent = state.map.put(key, clonedEvent);
                 if (oldEvent != null) {
-                    countMap.put(key, countMap.get(key) + 1);
+                    state.countMap.put(key, state.countMap.get(key) + 1);
                     streamEventChunk.add(streamEvent);
                 } else {
                     //  This is a new event
-                    if (map.size() > mostFrequentCount) {
-                        List<String> keys = new ArrayList<String>(countMap.keySet());
+                    if (state.map.size() > mostFrequentCount) {
+                        List<String> keys = new ArrayList<String>(state.countMap.keySet());
                         for (int i = 0; i < mostFrequentCount; i++) {
-                            int count = countMap.get(keys.get(i)) - 1;
+                            int count = state.countMap.get(keys.get(i)) - 1;
                             if (count == 0) {
-                                countMap.remove(keys.get(i));
-                                StreamEvent expiredEvent = map.remove(keys.get(i));
+                                state.countMap.remove(keys.get(i));
+                                StreamEvent expiredEvent = state.map.remove(keys.get(i));
                                 expiredEvent.setTimestamp(currentTime);
                                 streamEventChunk.add(expiredEvent);
                             } else {
-                                countMap.put(keys.get(i), count);
+                                state.countMap.put(keys.get(i), count);
                             }
                         }
                         // now we have tried to remove one for newly added item
-                        if (map.size() > mostFrequentCount) {
+                        if (state.map.size() > mostFrequentCount) {
                             //nothing happend by the attempt to remove one from the
                             // map so we are ignoring this event
-                            map.remove(key);
+                            state.map.remove(key);
                             // Here we do nothing just drop the message
                         } else {
                             // we got some space, event is already there in map object
                             // we just have to add it to the countMap
-                            countMap.put(key, 1);
+                            state.countMap.put(key, 1);
                             streamEventChunk.add(streamEvent);
                         }
                     } else {
-                        countMap.put(generateKey(streamEvent), 1);
+                        state.countMap.put(generateKey(streamEvent), 1);
                         streamEventChunk.add(streamEvent);
                     }
                 }
@@ -170,20 +173,6 @@ public void stop() {
         //Do nothing
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("CountMap", countMap);
-        }
-        return state;
-    }
-
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        countMap = (ConcurrentHashMap<String, Integer>) state.get("CountMap");
-    }
-
     private String generateKey(StreamEvent event) {      // for performance reason if its all attribute we don't do
         // the attribute list check
         StringBuilder stringBuilder = new StringBuilder();
@@ -199,16 +188,42 @@ private String generateKey(StreamEvent event) {      // for performance reason i
         return stringBuilder.toString();
     }
 
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, map.values(), streamEventCloner);
-    }
-
     @Override
     public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
                                               List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(map.values(), condition, matchingMetaInfoHolder,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.map.values(), condition, matchingMetaInfoHolder,
                 variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
+
+    @Override
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.map.values(), streamEventCloner);
+    }
+
+    class WindowState extends State {
+        private ConcurrentHashMap<String, Integer> countMap = new ConcurrentHashMap<String, Integer>();
+        private ConcurrentHashMap<String, StreamEvent> map = new ConcurrentHashMap<String, StreamEvent>();
+
+        @Override
+        public boolean canDestroy() {
+            return countMap.isEmpty() && map.isEmpty();
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("CountMap", countMap);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            countMap = (ConcurrentHashMap<String, Integer>) state.get("CountMap");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/GroupingFindableWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/GroupingFindableWindowProcessor.java
new file mode 100644
index 0000000000..11add75eee
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/GroupingFindableWindowProcessor.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.query.processor.stream.window;
+
+import io.siddhi.core.config.SiddhiQueryContext;
+import io.siddhi.core.event.state.StateEvent;
+import io.siddhi.core.event.stream.StreamEvent;
+import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.executor.VariableExpressionExecutor;
+import io.siddhi.core.table.Table;
+import io.siddhi.core.util.collection.operator.CompiledCondition;
+import io.siddhi.core.util.collection.operator.MatchingMetaInfoHolder;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.query.api.expression.Expression;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Window that process event processing as a group while supporting event search
+ *
+ * @param <S> current state of the processor
+ */
+public abstract class GroupingFindableWindowProcessor<S extends State> extends GroupingWindowProcessor<S>
+        implements FindableProcessor {
+
+    @Override
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
+        S state = stateHolder.getState();
+        try {
+            return compileCondition(condition, matchingMetaInfoHolder, variableExpressionExecutors, tableMap,
+                    state, siddhiQueryContext);
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    @Override
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
+        S state = stateHolder.getState();
+        try {
+            return find(matchingEvent, compiledCondition, streamEventClonerHolder.getStreamEventCloner(),
+                    state);
+        } finally {
+            stateHolder.returnState(state);
+        }
+
+    }
+
+    /**
+     * To construct a finder having the capability of finding events at the processor that corresponds to the incoming
+     * matchingEvent and the given matching expression logic.
+     *
+     * @param condition                   the matching condition
+     * @param matchingMetaInfoHolder      the meta structure of the incoming matchingEvent
+     * @param variableExpressionExecutors the list of variable ExpressionExecutors already created
+     * @param tableMap                    map of event tables
+     * @param state                       current query state
+     * @param siddhiQueryContext          current siddhi query context
+     * @return compiled Condition having the capability of matching events against the incoming matchingEvent
+     */
+    public abstract CompiledCondition compileCondition(Expression condition,
+                                                       MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                                       List<VariableExpressionExecutor> variableExpressionExecutors,
+                                                       Map<String, Table> tableMap, S state,
+                                                       SiddhiQueryContext siddhiQueryContext);
+
+    /**
+     * To find events from the processor event pool, that the matches the matchingEvent based on finder logic.
+     *
+     * @param matchingEvent     the event to be matched with the events at the processor
+     * @param compiledCondition the execution element responsible for matching the corresponding events that matches
+     *                          the matchingEvent based on pool of events at Processor
+     * @param streamEventCloner stream event cloner
+     * @param state             current query state  @return the matched events
+     */
+    public abstract StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                                     StreamEventCloner streamEventCloner, S state);
+
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/GroupingWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/GroupingWindowProcessor.java
index 4046ae57a5..9ce8bde753 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/GroupingWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/GroupingWindowProcessor.java
@@ -24,6 +24,7 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.event.stream.populater.SelectiveComplexEventPopulater;
 import io.siddhi.core.event.stream.populater.StreamEventPopulaterFactory;
@@ -31,6 +32,8 @@
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.AbstractDefinition;
 import io.siddhi.query.api.definition.Attribute;
 
@@ -39,24 +42,27 @@
 
 /**
  * Performs event processing with key based event groups
+ *
+ * @param <S> current state of the processor
  */
-public abstract class GroupingWindowProcessor extends WindowProcessor {
+public abstract class GroupingWindowProcessor<S extends State> extends WindowProcessor<S> {
 
     protected List<Attribute> internalAttributes;
     protected GroupingKeyPopulator groupingKeyPopulator;
 
     @Override
-    protected List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
+    protected StateFactory<S> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
                                    ExpressionExecutor[] attributeExpressionExecutors,
-                                   ConfigReader configReader,
-                                   boolean outputExpectsExpiredEvents,
+                                   ConfigReader configReader, StreamEventClonerHolder streamEventClonerHolder,
+                                   boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
                                    SiddhiQueryContext siddhiQueryContext) {
-        init(attributeExpressionExecutors, configReader, outputExpectsExpiredEvents, siddhiQueryContext);
+        StateFactory<S> stateFactory = init(attributeExpressionExecutors, configReader, outputExpectsExpiredEvents,
+                siddhiQueryContext);
         Attribute groupingKey = new Attribute("_groupingKey", Attribute.Type.STRING);
         internalAttributes = new ArrayList<Attribute>(1);
         internalAttributes.add(groupingKey);
         metaStreamEvent.addData(groupingKey);
-        return new ArrayList<>(0);
+        return stateFactory;
     }
 
     /**
@@ -67,13 +73,14 @@ protected List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefiniti
      * @param outputExpectsExpiredEvents   is expired events sent as output
      * @param siddhiQueryContext           the context of the siddhi query
      */
-    protected abstract void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                                 boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext);
+    protected abstract StateFactory<S> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                            ConfigReader configReader, boolean outputExpectsExpiredEvents,
+                                            SiddhiQueryContext siddhiQueryContext);
 
     protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
                                      StreamEventCloner streamEventCloner,
-                                     ComplexEventPopulater complexEventPopulater) {
-        processEventChunk(streamEventChunk, nextProcessor, streamEventCloner, groupingKeyPopulator);
+                                     ComplexEventPopulater complexEventPopulater, S state) {
+        processEventChunk(streamEventChunk, nextProcessor, streamEventCloner, groupingKeyPopulator, state);
     }
 
     /**
@@ -83,10 +90,11 @@ protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk
      * @param nextProcessor        the next processor to which the success events need to be passed
      * @param streamEventCloner    helps to clone the incoming event for local storage or modification
      * @param groupingKeyPopulater helps to populate the events with the grouping key
+     * @param state                current state of the processor
      */
     protected abstract void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk,
                                               Processor nextProcessor, StreamEventCloner streamEventCloner,
-                                              GroupingKeyPopulator groupingKeyPopulater);
+                                              GroupingKeyPopulator groupingKeyPopulater, S state);
 
     public void constructStreamEventPopulater(MetaStreamEvent metaStreamEvent, int streamEventChainIndex) {
         super.constructStreamEventPopulater(metaStreamEvent, streamEventChainIndex);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/HopingWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/HopingWindowProcessor.java
index 1f076c8345..1491c3a27d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/HopingWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/HopingWindowProcessor.java
@@ -24,6 +24,7 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.event.stream.populater.SelectiveComplexEventPopulater;
 import io.siddhi.core.event.stream.populater.StreamEventPopulaterFactory;
@@ -31,6 +32,8 @@
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.AbstractDefinition;
 import io.siddhi.query.api.definition.Attribute;
 
@@ -39,23 +42,27 @@
 
 /**
  * Performs event processing in a hopping manner
+ *
+ * @param <S> current state of the processor
  */
-public abstract class HopingWindowProcessor extends WindowProcessor {
+public abstract class HopingWindowProcessor<S extends State> extends WindowProcessor<S> {
 
     protected List<Attribute> internalAttributes;
     protected HopingTimestampPopulator hopingTimestampPopulator;
 
     @Override
-    protected List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
+    protected StateFactory<S> init(MetaStreamEvent metaStreamEvent, AbstractDefinition inputDefinition,
                                    ExpressionExecutor[] attributeExpressionExecutors,
-                                   ConfigReader configReader,
-                                   boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
-        init(attributeExpressionExecutors, configReader, outputExpectsExpiredEvents, siddhiQueryContext);
+                                   ConfigReader configReader, StreamEventClonerHolder streamEventClonerHolder,
+                                   boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                   SiddhiQueryContext siddhiQueryContext) {
+        StateFactory<S> stateFactory = init(attributeExpressionExecutors, configReader, outputExpectsExpiredEvents,
+                siddhiQueryContext);
         Attribute groupingKey = new Attribute("_hopingTimestamp", Attribute.Type.STRING);
         internalAttributes = new ArrayList<Attribute>(1);
         internalAttributes.add(groupingKey);
         metaStreamEvent.addData(groupingKey);
-        return new ArrayList<>(0);
+        return stateFactory;
     }
 
     /**
@@ -66,12 +73,14 @@ protected List<Attribute> init(MetaStreamEvent metaStreamEvent, AbstractDefiniti
      * @param outputExpectsExpiredEvents   is expired events sent as output
      * @param siddhiQueryContext           the context of the siddhi query
      */
-    protected abstract void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                                 boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext);
+    protected abstract StateFactory<S> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                            ConfigReader configReader,
+                                            boolean outputExpectsExpiredEvents,
+                                            SiddhiQueryContext siddhiQueryContext);
 
     protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
                                      StreamEventCloner streamEventCloner,
-                                     ComplexEventPopulater complexEventPopulater) {
+                                     ComplexEventPopulater complexEventPopulater, S state) {
         processEventChunk(streamEventChunk, nextProcessor, streamEventCloner, hopingTimestampPopulator);
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthBatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthBatchWindowProcessor.java
index c58ef383eb..b07a990861 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthBatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthBatchWindowProcessor.java
@@ -28,6 +28,7 @@
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
 import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -39,6 +40,8 @@
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
 
@@ -102,20 +105,18 @@
                 )
         }
 )
-public class LengthBatchWindowProcessor extends BatchingWindowProcessor implements FindableProcessor {
+public class LengthBatchWindowProcessor extends
+        BatchingFindableWindowProcessor<LengthBatchWindowProcessor.WindowState> {
 
     private int length;
-    private int count = 0;
-    private SnapshotableStreamEventQueue currentEventQueue = null;
-    private SnapshotableStreamEventQueue expiredEventQueue = null;
     private boolean outputExpectsExpiredEvents;
     private SiddhiQueryContext siddhiQueryContext;
     private boolean isStreamCurrentEvents = false;
-    private StreamEvent resetEvent = null;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                StreamEventClonerHolder streamEventClonerHolder, boolean outputExpectsExpiredEvents,
+                                boolean findToBeExecuted, SiddhiQueryContext siddhiQueryContext) {
         this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
         this.siddhiQueryContext = siddhiQueryContext;
         if (attributeExpressionExecutors.length >= 1) {
@@ -140,35 +141,34 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                     "window.length) or two parameters (<int> window.length, <bool> stream.current.event), " +
                     "but found " + attributeExpressionExecutors.length + " input parameters.");
         }
-        if (!isStreamCurrentEvents) {
-            currentEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
-        }
-        if (outputExpectsExpiredEvents) {
-            expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
-        }
+        return () -> new WindowState(streamEventClonerHolder, isStreamCurrentEvents,
+                outputExpectsExpiredEvents, findToBeExecuted);
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
+
         List<ComplexEventChunk<StreamEvent>> streamEventChunks = new ArrayList<ComplexEventChunk<StreamEvent>>();
-        synchronized (this) {
+        synchronized (state) {
             ComplexEventChunk<StreamEvent> outputStreamEventChunk = new ComplexEventChunk<StreamEvent>(true);
             long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
                 streamEventChunk.remove();
                 if (length == 0) {
-                    processLengthZeroBatch(streamEvent, outputStreamEventChunk, currentTime);
+                    processLengthZeroBatch(streamEvent, outputStreamEventChunk, currentTime, streamEventCloner);
                 } else {
-                    if (resetEvent == null) {
-                        resetEvent = streamEventCloner.copyStreamEvent(streamEvent);
-                        resetEvent.setType(ComplexEvent.Type.RESET);
+                    if (state.resetEvent == null) {
+                        state.resetEvent = streamEventCloner.copyStreamEvent(streamEvent);
+                        state.resetEvent.setType(ComplexEvent.Type.RESET);
                     }
                     if (isStreamCurrentEvents) {
-                        processStreamCurrentEvents(streamEvent, outputStreamEventChunk, currentTime);
+                        processStreamCurrentEvents(streamEvent, outputStreamEventChunk, currentTime, state,
+                                streamEventCloner);
                     } else {
-                        processFullBatchEvents(streamEvent, outputStreamEventChunk, currentTime);
+                        processFullBatchEvents(streamEvent, outputStreamEventChunk, currentTime, state,
+                                streamEventCloner);
                     }
                 }
                 if (outputStreamEventChunk.getFirst() != null) {
@@ -184,7 +184,7 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
 
     private void processLengthZeroBatch(StreamEvent streamEvent,
                                         ComplexEventChunk<StreamEvent> outputStreamEventChunk,
-                                        long currentTime) {
+                                        long currentTime, StreamEventCloner streamEventCloner) {
 
         outputStreamEventChunk.add(streamEvent);
         if (outputExpectsExpiredEvents) {
@@ -201,69 +201,70 @@ private void processLengthZeroBatch(StreamEvent streamEvent,
 
     private void processFullBatchEvents(StreamEvent streamEvent,
                                         ComplexEventChunk<StreamEvent> outputStreamEventChunk,
-                                        long currentTime) {
+                                        long currentTime, WindowState state, StreamEventCloner streamEventCloner) {
         StreamEvent clonedStreamEvent = streamEventCloner.copyStreamEvent(streamEvent);
-        currentEventQueue.add(clonedStreamEvent);
-        count++;
-        if (count == length) {
-            if (outputExpectsExpiredEvents && expiredEventQueue.getFirst() != null) {
-                while (expiredEventQueue.hasNext()) {
-                    StreamEvent expiredEvent = expiredEventQueue.next();
+        state.currentEventQueue.add(clonedStreamEvent);
+        state.count++;
+        if (state.count == length) {
+            if (outputExpectsExpiredEvents && state.expiredEventQueue.getFirst() != null) {
+                while (state.expiredEventQueue.hasNext()) {
+                    StreamEvent expiredEvent = state.expiredEventQueue.next();
                     expiredEvent.setTimestamp(currentTime);
                 }
-                outputStreamEventChunk.add(expiredEventQueue.getFirst());
-                expiredEventQueue.clear();
+                outputStreamEventChunk.add(state.expiredEventQueue.getFirst());
+                state.expiredEventQueue.clear();
             }
 
-            if (resetEvent != null) {
-                resetEvent.setTimestamp(currentTime);
-                outputStreamEventChunk.add(resetEvent);
-                resetEvent = null;
+            if (state.resetEvent != null) {
+                state.resetEvent.setTimestamp(currentTime);
+                outputStreamEventChunk.add(state.resetEvent);
+                state.resetEvent = null;
             }
 
-            if (currentEventQueue.getFirst() != null) {
-                if (expiredEventQueue != null) {
-                    currentEventQueue.reset();
-                    while (currentEventQueue.hasNext()) {
-                        StreamEvent currentEvent = currentEventQueue.next();
+            if (state.currentEventQueue.getFirst() != null) {
+                if (state.expiredEventQueue != null) {
+                    state.currentEventQueue.reset();
+                    while (state.currentEventQueue.hasNext()) {
+                        StreamEvent currentEvent = state.currentEventQueue.next();
                         StreamEvent toExpireEvent = streamEventCloner.copyStreamEvent(currentEvent);
                         toExpireEvent.setType(StreamEvent.Type.EXPIRED);
-                        expiredEventQueue.add(toExpireEvent);
+                        state.expiredEventQueue.add(toExpireEvent);
                     }
                 }
-                outputStreamEventChunk.add(currentEventQueue.getFirst());
-                currentEventQueue.clear();
+                outputStreamEventChunk.add(state.currentEventQueue.getFirst());
+                state.currentEventQueue.clear();
             }
-            count = 0;
+            state.count = 0;
         }
     }
 
     private void processStreamCurrentEvents(StreamEvent streamEvent,
                                             ComplexEventChunk<StreamEvent> outputStreamEventChunk,
-                                            long currentTime) {
-        count++;
-        if (count == length + 1) {
-            if (outputExpectsExpiredEvents && expiredEventQueue.getFirst() != null) {
-                while (expiredEventQueue.hasNext()) {
-                    StreamEvent expiredEvent = expiredEventQueue.next();
+                                            long currentTime, WindowState state,
+                                            StreamEventCloner streamEventCloner) {
+        state.count++;
+        if (state.count == length + 1) {
+            if (outputExpectsExpiredEvents && state.expiredEventQueue.getFirst() != null) {
+                while (state.expiredEventQueue.hasNext()) {
+                    StreamEvent expiredEvent = state.expiredEventQueue.next();
                     expiredEvent.setTimestamp(currentTime);
                 }
-                outputStreamEventChunk.add(expiredEventQueue.getFirst());
-                expiredEventQueue.clear();
+                outputStreamEventChunk.add(state.expiredEventQueue.getFirst());
+                state.expiredEventQueue.clear();
             }
 
-            if (resetEvent != null) {
-                resetEvent.setTimestamp(currentTime);
-                outputStreamEventChunk.add(resetEvent);
-                resetEvent = null;
+            if (state.resetEvent != null) {
+                state.resetEvent.setTimestamp(currentTime);
+                outputStreamEventChunk.add(state.resetEvent);
+                state.resetEvent = null;
             }
-            count = 1;
+            state.count = 1;
         }
         outputStreamEventChunk.add(streamEvent);
-        if (expiredEventQueue != null) {
+        if (state.expiredEventQueue != null) {
             StreamEvent clonedStreamEvent = streamEventCloner.copyStreamEvent(streamEvent);
             clonedStreamEvent.setType(StreamEvent.Type.EXPIRED);
-            expiredEventQueue.add(clonedStreamEvent);
+            state.expiredEventQueue.add(clonedStreamEvent);
         }
 
     }
@@ -278,47 +279,71 @@ public void stop() {
         //Do nothing
     }
 
+
     @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("Count", count);
-            state.put("CurrentEventQueue", currentEventQueue != null ? currentEventQueue.getSnapshot() : null);
-            state.put("ExpiredEventQueue", expiredEventQueue != null ? expiredEventQueue.getSnapshot() : null);
-            state.put("ResetEvent", resetEvent);
-        }
-        return state;
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventQueue, condition, matchingMetaInfoHolder,
+                variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
-
     @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        count = (int) state.get("Count");
-        if (currentEventQueue != null) {
-            currentEventQueue.clear();
-            currentEventQueue.restore((SnapshotStateList) state.get("CurrentEventQueue"));
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventQueue, streamEventCloner);
+    }
+
+    class WindowState extends State {
+
+        private int count = 0;
+        private SnapshotableStreamEventQueue currentEventQueue = null;
+        private SnapshotableStreamEventQueue expiredEventQueue = null;
+        private StreamEvent resetEvent = null;
+
+        public WindowState(StreamEventClonerHolder streamEventClonerHolder, boolean isStreamCurrentEvents,
+                           boolean outputExpectsExpiredEvents, boolean findToBeExecuted) {
+            if (!isStreamCurrentEvents) {
+                currentEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+            }
+            if (outputExpectsExpiredEvents || findToBeExecuted) {
+                expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+            }
         }
 
-        if (expiredEventQueue != null) {
-            expiredEventQueue.clear();
-            expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+        @Override
+        public boolean canDestroy() {
+            return (currentEventQueue == null || currentEventQueue.getFirst() == null) &&
+                    (expiredEventQueue == null || expiredEventQueue.getFirst() == null) &&
+                    resetEvent == null && count == 0;
         }
-        resetEvent = (StreamEvent) state.get("ResetEvent");
-    }
 
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventQueue, streamEventCloner);
-    }
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("Count", count);
+                state.put("CurrentEventQueue", currentEventQueue != null ? currentEventQueue.getSnapshot() : null);
+                state.put("ExpiredEventQueue", expiredEventQueue != null ? expiredEventQueue.getSnapshot() : null);
+                state.put("ResetEvent", resetEvent);
+            }
+            return state;
+        }
 
-    @Override
-    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
-                                              List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        if (expiredEventQueue == null) {
-            expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+        @Override
+        public void restore(Map<String, Object> state) {
+            count = (int) state.get("Count");
+            if (currentEventQueue != null) {
+                currentEventQueue.clear();
+                currentEventQueue.restore((SnapshotStateList) state.get("CurrentEventQueue"));
+            }
+
+            if (expiredEventQueue != null) {
+                expiredEventQueue.clear();
+                expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+            }
+            resetEvent = (StreamEvent) state.get("ResetEvent");
         }
-        return OperatorParser.constructOperator(expiredEventQueue, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthWindowProcessor.java
index 674cbb48a7..5be3df0e4c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthWindowProcessor.java
@@ -39,6 +39,8 @@
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
 
@@ -72,11 +74,9 @@
                 description = "This will process last 10 events in a sliding manner."
         )
 )
-public class LengthWindowProcessor extends SlidingWindowProcessor implements FindableProcessor {
+public class LengthWindowProcessor extends SlidingFindableWindowProcessor<LengthWindowProcessor.WindowState> {
 
     private int length;
-    private int count = 0;
-    private SnapshotableStreamEventQueue expiredEventQueue;
 
     public int getLength() {
         return length;
@@ -87,35 +87,35 @@ public void setLength(int length) {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length == 1) {
             length = (Integer) ((ConstantExpressionExecutor) attributeExpressionExecutors[0]).getValue();
         } else {
             throw new SiddhiAppValidationException("Length window should only have one parameter (<int> " +
                     "window.length), but found " + attributeExpressionExecutors.length + " input parameters.");
         }
-        expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder, length);
+        return ()-> new WindowState();
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
-        synchronized (this) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
+        synchronized (state) {
             long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
                 StreamEvent clonedEvent = streamEventCloner.copyStreamEvent(streamEvent);
                 clonedEvent.setType(StreamEvent.Type.EXPIRED);
-                if (count < length) {
-                    count++;
-                    this.expiredEventQueue.add(clonedEvent);
+                if (state.count < length) {
+                    state.count++;
+                    state.expiredEventQueue.add(clonedEvent);
                 } else {
-                    StreamEvent firstEvent = this.expiredEventQueue.poll();
+                    StreamEvent firstEvent = state.expiredEventQueue.poll();
                     if (firstEvent != null) {
                         firstEvent.setTimestamp(currentTime);
                         streamEventChunk.insertBeforeCurrent(firstEvent);
-                        this.expiredEventQueue.add(clonedEvent);
+                        state.expiredEventQueue.add(clonedEvent);
                     } else {
                         StreamEvent resetEvent = streamEventCloner.copyStreamEvent(streamEvent);
                         resetEvent.setType(ComplexEvent.Type.RESET);
@@ -137,19 +137,22 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
         nextProcessor.process(streamEventChunk);
     }
 
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventQueue, streamEventCloner);
-    }
-
     @Override
     public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
                                               List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(expiredEventQueue, condition, matchingMetaInfoHolder,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventQueue, condition, matchingMetaInfoHolder,
                 variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
+    @Override
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventQueue, streamEventCloner);
+
+    }
+
     @Override
     public void start() {
         //Do nothing
@@ -161,21 +164,32 @@ public void stop() {
     }
 
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("Count", count);
-            state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
+    class WindowState extends State {
+
+        private int count = 0;
+        private SnapshotableStreamEventQueue expiredEventQueue =
+                new SnapshotableStreamEventQueue(streamEventClonerHolder, length);
+
+        @Override
+        public boolean canDestroy() {
+            return count == 0 && expiredEventQueue.getFirst() == null;
         }
-        return state;
-    }
 
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("Count", count);
+                state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
+            }
+            return state;
+        }
 
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        count = (int) state.get("Count");
-        expiredEventQueue.clear();
-        expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+        @Override
+        public void restore(Map<String, Object> state) {
+            count = (int) state.get("Count");
+            expiredEventQueue.clear();
+            expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LossyFrequentWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LossyFrequentWindowProcessor.java
index ad1af1074e..a0f2de21cc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LossyFrequentWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LossyFrequentWindowProcessor.java
@@ -37,6 +37,8 @@
 import io.siddhi.core.util.collection.operator.Operator;
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.expression.Expression;
 import org.apache.log4j.Logger;
 
@@ -100,21 +102,18 @@
         }
 )
 @Deprecated
-public class LossyFrequentWindowProcessor extends SlidingWindowProcessor implements FindableProcessor {
+public class LossyFrequentWindowProcessor extends
+        SlidingFindableWindowProcessor<LossyFrequentWindowProcessor.WindowState> {
     private static final Logger log = Logger.getLogger(LossyFrequentWindowProcessor.class);
-    private ConcurrentHashMap<String, LossyCount> countMap = new ConcurrentHashMap<String, LossyCount>();
-    private ConcurrentHashMap<String, StreamEvent> map = new ConcurrentHashMap<String, StreamEvent>();
     private VariableExpressionExecutor[] variableExpressionExecutors;
 
-    private int totalCount = 0;
-    private double currentBucketId = 1;
     private double support;           // these will be initialize during init
     private double error;             // these will be initialize during init
     private double windowWidth;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         support = Double.parseDouble(String.valueOf(((ConstantExpressionExecutor) attributeExpressionExecutors[0])
                 .getValue()));
         if (attributeExpressionExecutors.length > 1) {
@@ -133,14 +132,14 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             }
         }
         windowWidth = Math.ceil(1 / error);
-        currentBucketId = 1;
+        return () -> new WindowState();
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
 
-        synchronized (this) {
+        synchronized (state) {
             long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
 
             StreamEvent streamEvent = streamEventChunk.getFirst();
@@ -152,43 +151,43 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                 StreamEvent clonedEvent = streamEventCloner.copyStreamEvent(streamEvent);
                 clonedEvent.setType(StreamEvent.Type.EXPIRED);
 
-                totalCount++;
-                if (totalCount != 1) {
-                    currentBucketId = Math.ceil(totalCount / windowWidth);
+                state.totalCount++;
+                if (state.totalCount != 1) {
+                    state.currentBucketId = Math.ceil(state.totalCount / windowWidth);
                 }
                 String currentKey = generateKey(streamEvent);
-                StreamEvent oldEvent = map.put(currentKey, clonedEvent);
+                StreamEvent oldEvent = state.map.put(currentKey, clonedEvent);
                 if (oldEvent != null) {    // this event is already in the store
-                    countMap.put(currentKey, countMap.get(currentKey).incrementCount());
+                    state.countMap.put(currentKey, state.countMap.get(currentKey).incrementCount());
                 } else {
                     //  This is a new event
                     LossyCount lCount;
-                    lCount = new LossyCount(1, (int) currentBucketId - 1);
-                    countMap.put(currentKey, lCount);
+                    lCount = new LossyCount(1, (int) state.currentBucketId - 1);
+                    state.countMap.put(currentKey, lCount);
                 }
                 // calculating all the events in the system which match the
                 // requirement provided by the user
                 List<String> keys = new ArrayList<String>();
-                keys.addAll(countMap.keySet());
+                keys.addAll(state.countMap.keySet());
                 for (String key : keys) {
-                    LossyCount lossyCount = countMap.get(key);
-                    if (lossyCount.getCount() >= ((support - error) * totalCount)) {
+                    LossyCount lossyCount = state.countMap.get(key);
+                    if (lossyCount.getCount() >= ((support - error) * state.totalCount)) {
                         // among the selected events, if the newly arrive event is there we mark it as an inEvent
                         if (key.equals(currentKey)) {
                             streamEventChunk.add(streamEvent);
                         }
                     }
                 }
-                if (totalCount % windowWidth == 0) {
+                if (state.totalCount % windowWidth == 0) {
                     // its time to run the data-structure prune code
                     keys = new ArrayList<String>();
-                    keys.addAll(countMap.keySet());
+                    keys.addAll(state.countMap.keySet());
                     for (String key : keys) {
-                        LossyCount lossyCount = countMap.get(key);
-                        if (lossyCount.getCount() + lossyCount.getBucketId() <= currentBucketId) {
+                        LossyCount lossyCount = state.countMap.get(key);
+                        if (lossyCount.getCount() + lossyCount.getBucketId() <= state.currentBucketId) {
                             log.info("Removing the Event: " + key + " from the window");
-                            countMap.remove(key);
-                            StreamEvent expirtedEvent = map.remove(key);
+                            state.countMap.remove(key);
+                            StreamEvent expirtedEvent = state.map.remove(key);
                             expirtedEvent.setTimestamp(currentTime);
                             streamEventChunk.add(expirtedEvent);
                         }
@@ -210,22 +209,6 @@ public void stop() {
         //Do nothing
     }
 
-
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("CountMap", countMap);
-        }
-        return state;
-    }
-
-
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        countMap = (ConcurrentHashMap<String, LossyCount>) state.get("CountMap");
-    }
-
     private String generateKey(StreamEvent event) {      // for performance reason if its all attribute we don't do
         // the attribute list check
         StringBuilder stringBuilder = new StringBuilder();
@@ -241,19 +224,21 @@ private String generateKey(StreamEvent event) {      // for performance reason i
         return stringBuilder.toString();
     }
 
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, map.values(), streamEventCloner);
-    }
-
     @Override
     public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
                                               List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(map.values(), condition, matchingMetaInfoHolder,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.map.values(), condition, matchingMetaInfoHolder,
                 variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
+    @Override
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.map.values(), streamEventCloner);
+    }
+
     /**
      * Inner class to keep the lossy count
      */
@@ -287,4 +272,37 @@ public LossyCount incrementCount() {
             return this;
         }
     }
+
+    class WindowState extends State {
+
+        private int totalCount = 0;
+        private double currentBucketId = 1;
+        private ConcurrentHashMap<String, LossyCount> countMap = new ConcurrentHashMap<String, LossyCount>();
+        private ConcurrentHashMap<String, StreamEvent> map = new ConcurrentHashMap<String, StreamEvent>();
+
+        @Override
+        public boolean canDestroy() {
+            return countMap.isEmpty() && map.isEmpty();
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("CountMap", countMap);
+                state.put("Map", map);
+                state.put("TotalCount", totalCount);
+                state.put("CurrentBucketId", currentBucketId);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            countMap = (ConcurrentHashMap<String, LossyCount>) state.get("CountMap");
+            countMap = (ConcurrentHashMap<String, LossyCount>) state.get("Map");
+            totalCount = (Integer) state.get("TotalCount");
+            currentBucketId = (Double) state.get("CurrentBucketId");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SessionWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SessionWindowProcessor.java
index 167207b050..689cb22c39 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SessionWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SessionWindowProcessor.java
@@ -40,11 +40,14 @@
 import io.siddhi.core.util.collection.operator.Operator;
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
 import org.apache.log4j.Logger;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -52,8 +55,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static java.util.stream.Collectors.toMap;
-
 /**
  * Implementation of {@link WindowProcessor} which represent a Window operating based on a session.
  */
@@ -102,7 +103,8 @@
                 )
         }
 )
-public class SessionWindowProcessor extends GroupingWindowProcessor implements SchedulingProcessor, FindableProcessor {
+public class SessionWindowProcessor extends GroupingFindableWindowProcessor<SessionWindowProcessor.WindowState>
+        implements SchedulingProcessor {
 
     private static final Logger log = Logger.getLogger(SessionWindowProcessor.class);
     private static final String DEFAULT_KEY = "default-key";
@@ -110,10 +112,6 @@ public class SessionWindowProcessor extends GroupingWindowProcessor implements S
     private long allowedLatency = 0;
     private VariableExpressionExecutor sessionKeyExecutor;
     private Scheduler scheduler;
-    private Map<String, SessionContainer> sessionMap;
-    private Map<String, Long> sessionKeyEndTimeMap;
-    private SessionContainer sessionContainer;
-    private SessionComplexEventChunk<StreamEvent> expiredEventChunk;
 
     @Override
     public Scheduler getScheduler() {
@@ -126,14 +124,9 @@ public void setScheduler(Scheduler scheduler) {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors,
-                        ConfigReader configReader, boolean outputExpectsExpiredEvents,
-                        SiddhiQueryContext siddhiQueryContext) {
-        this.sessionMap = new ConcurrentHashMap<>();
-        this.sessionKeyEndTimeMap = new HashMap<>();
-        this.sessionContainer = new SessionContainer();
-        this.expiredEventChunk = new SessionComplexEventChunk<>();
-
+    protected StateFactory<WindowState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                             ConfigReader configReader, boolean outputExpectsExpiredEvents,
+                                             SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length >= 1 && attributeExpressionExecutors.length <= 3) {
 
             if (attributeExpressionExecutors[0] instanceof ConstantExpressionExecutor) {
@@ -209,24 +202,18 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors,
 
         }
 
-    }
-
-    private void validateAllowedLatency(long allowedLatency, long sessionGap) {
-        if (allowedLatency > sessionGap) {
-            throw new SiddhiAppValidationException("Session window's allowedLatency parameter value "
-                    + "should not be greater than the session gap parameter value");
-
-        }
+        return () -> new WindowState();
     }
 
     @Override
     protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                     StreamEventCloner streamEventCloner,
-                                     GroupingKeyPopulator groupingKeyPopulater) {
+                                     StreamEventCloner streamEventCloner, GroupingKeyPopulator groupingKeyPopulater,
+                                     WindowState state) {
+
         String key = DEFAULT_KEY;
         SessionComplexEventChunk<StreamEvent> currentSession;
 
-        synchronized (this) {
+        synchronized (state) {
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
                 long eventTimestamp = streamEvent.getTimestamp();
@@ -246,18 +233,18 @@ protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk
                     //get the session configuration based on session key
                     //if the map doesn't contain key, then a new sessionContainer
                     //object needs to be created.
-                    if ((sessionContainer = sessionMap.get(key)) == null) {
-                        sessionContainer = new SessionContainer(key);
+                    if ((state.sessionContainer = state.sessionMap.get(key)) == null) {
+                        state.sessionContainer = new SessionContainer(key);
                     }
-                    sessionMap.put(key, sessionContainer);
+                    state.sessionMap.put(key, state.sessionContainer);
 
                     StreamEvent clonedStreamEvent = streamEventCloner.copyStreamEvent(streamEvent);
                     clonedStreamEvent.setType(StreamEvent.Type.EXPIRED);
 
-                    currentSession = sessionContainer.getCurrentSession();
+                    currentSession = state.sessionContainer.getCurrentSession();
 
                     //if current session is empty
-                    if (sessionContainer.getCurrentSession().getFirst() == null) {
+                    if (state.sessionContainer.getCurrentSession().getFirst() == null) {
                         currentSession.add(clonedStreamEvent);
                         currentSession.setTimestamps(eventTimestamp, maxTimestamp, aliveTimestamp);
                         scheduler.notifyAt(maxTimestamp);
@@ -272,7 +259,7 @@ protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk
                             } else {
                                 //when a new session starts
                                 if (allowedLatency > 0) {
-                                    moveCurrentSessionToPreviousSession();
+                                    moveCurrentSessionToPreviousSession(state);
                                     currentSession.clear();
                                     currentSession.setTimestamps(eventTimestamp, maxTimestamp, aliveTimestamp);
                                     currentSession.add(clonedStreamEvent);
@@ -282,27 +269,36 @@ protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk
 
                         } else {
                             //when a late event arrives
-                            addLateEvent(streamEventChunk, eventTimestamp, clonedStreamEvent);
+                            addLateEvent(streamEventChunk, eventTimestamp, clonedStreamEvent, state);
                         }
                     }
                 } else {
-                    currentSessionTimeout(eventTimestamp);
+                    currentSessionTimeout(eventTimestamp, state);
                     if (allowedLatency > 0) {
-                        previousSessionTimeout(eventTimestamp);
+                        previousSessionTimeout(eventTimestamp, state);
                     }
                 }
             }
         }
 
-        if (expiredEventChunk != null && expiredEventChunk.getFirst() != null) {
-            streamEventChunk.add((StreamEvent) expiredEventChunk.getFirst());
-            expiredEventChunk.clear();
+        if (state.expiredEventChunk != null && state.expiredEventChunk.getFirst() != null) {
+            streamEventChunk.add((StreamEvent) state.expiredEventChunk.getFirst());
+            state.expiredEventChunk.clear();
         }
 
         nextProcessor.process(streamEventChunk);
 
     }
 
+
+    private void validateAllowedLatency(long allowedLatency, long sessionGap) {
+        if (allowedLatency > sessionGap) {
+            throw new SiddhiAppValidationException("Session window's allowedLatency parameter value "
+                    + "should not be greater than the session gap parameter value");
+
+        }
+    }
+
     /**
      * Merge previous window with the next window.
      */
@@ -324,20 +320,22 @@ private void mergeWindows(SessionComplexEventChunk<StreamEvent> previousWindow,
 
     /**
      * Moves the events in the current session into previous window.
+     *
+     * @param state
      */
-    private void moveCurrentSessionToPreviousSession() {
+    private void moveCurrentSessionToPreviousSession(WindowState state) {
 
-        SessionComplexEventChunk<StreamEvent> currentSession = sessionContainer.getCurrentSession();
-        SessionComplexEventChunk<StreamEvent> previousSession = sessionContainer.getPreviousSession();
+        SessionComplexEventChunk<StreamEvent> currentSession = state.sessionContainer.getCurrentSession();
+        SessionComplexEventChunk<StreamEvent> previousSession = state.sessionContainer.getPreviousSession();
 
         if (previousSession.getFirst() == null) {
             previousSession.add(currentSession.getFirst());
 
         } else {
-            expiredEventChunk.setKey(previousSession.getKey());
-            expiredEventChunk.setTimestamps(previousSession.getStartTimestamp(),
+            state.expiredEventChunk.setKey(previousSession.getKey());
+            state.expiredEventChunk.setTimestamps(previousSession.getStartTimestamp(),
                     previousSession.getEndTimestamp(), previousSession.getAliveTimestamp());
-            expiredEventChunk.add(previousSession.getFirst());
+            state.expiredEventChunk.add(previousSession.getFirst());
 
             previousSession.clear();
             previousSession.add(currentSession.getFirst());
@@ -354,10 +352,10 @@ private void moveCurrentSessionToPreviousSession() {
      * Handles when the late event arrives to the system.
      */
     private void addLateEvent(ComplexEventChunk<StreamEvent> streamEventChunk,
-                              long eventTimestamp, StreamEvent streamEvent) {
+                              long eventTimestamp, StreamEvent streamEvent, WindowState state) {
 
-        SessionComplexEventChunk<StreamEvent> currentSession = sessionContainer.getCurrentSession();
-        SessionComplexEventChunk<StreamEvent> previousSession = sessionContainer.getPreviousSession();
+        SessionComplexEventChunk<StreamEvent> currentSession = state.sessionContainer.getCurrentSession();
+        SessionComplexEventChunk<StreamEvent> previousSession = state.sessionContainer.getPreviousSession();
 
         if (allowedLatency > 0) {
 
@@ -417,21 +415,26 @@ private void addLateEvent(ComplexEventChunk<StreamEvent> streamEventChunk,
     /**
      * Checks all the sessions and get the expired session.
      */
-    private void currentSessionTimeout(long eventTimestamp) {
-        Map<String, Long> currentEndTimestamps = findAllCurrentEndTimestamps(sessionMap);
+    private void currentSessionTimeout(long eventTimestamp, WindowState state) {
+        Map<String, Long> currentEndTimestamps = findAllCurrentEndTimestamps(state);
 
         //sort on endTimestamps
         if (currentEndTimestamps.size() > 1) {
-            currentEndTimestamps = currentEndTimestamps.entrySet().stream().sorted(Map.Entry.comparingByValue())
-                    .collect(toMap(e -> e.getKey(), e -> e.getValue(), (e1, e2) -> e1,
-                            LinkedHashMap::new));
+            List<Map.Entry<String, Long>> toSort = new ArrayList<>();
+            toSort.addAll(currentEndTimestamps.entrySet());
+            toSort.sort(Map.Entry.comparingByValue());
+            Map<String, Long> map = new LinkedHashMap<>();
+            for (Map.Entry<String, Long> e : toSort) {
+                map.putIfAbsent(e.getKey(), e.getValue());
+            }
+            currentEndTimestamps = map;
         }
 
         for (Map.Entry<String, Long> entry : currentEndTimestamps.entrySet()) {
             long sessionEndTime = entry.getValue();
-            SessionComplexEventChunk<StreamEvent> currentSession = sessionMap.get(entry.getKey())
+            SessionComplexEventChunk<StreamEvent> currentSession = state.sessionMap.get(entry.getKey())
                     .getCurrentSession();
-            SessionComplexEventChunk<StreamEvent> previousSession = sessionMap.get(entry.getKey())
+            SessionComplexEventChunk<StreamEvent> previousSession = state.sessionMap.get(entry.getKey())
                     .getPreviousSession();
             if (currentSession.getFirst() != null && eventTimestamp >= sessionEndTime) {
 
@@ -444,14 +447,13 @@ private void currentSessionTimeout(long eventTimestamp) {
                     scheduler.notifyAt(currentSession.getAliveTimestamp());
                     currentSession.clear();
                 } else {
-                    expiredEventChunk.setKey(currentSession.getKey());
-                    expiredEventChunk.setTimestamps(currentSession.getStartTimestamp(),
+                    state.expiredEventChunk.setKey(currentSession.getKey());
+                    state.expiredEventChunk.setTimestamps(currentSession.getStartTimestamp(),
                             currentSession.getEndTimestamp(),
                             currentSession.getAliveTimestamp());
-                    expiredEventChunk.add(currentSession.getFirst());
+                    state.expiredEventChunk.add(currentSession.getFirst());
                     currentSession.clear();
                 }
-
             } else {
                 break;
             }
@@ -461,29 +463,36 @@ private void currentSessionTimeout(long eventTimestamp) {
     /**
      * Checks all the previous sessions and get the expired sessions.
      */
-    private void previousSessionTimeout(long eventTimestamp) {
+    private void previousSessionTimeout(long eventTimestamp, WindowState state) {
 
-        Map<String, Long> previousEndTimestamps = findAllPreviousEndTimestamps(sessionMap);
+        Map<String, Long> previousEndTimestamps = findAllPreviousEndTimestamps(state);
         SessionComplexEventChunk<StreamEvent> previousSession;
 
         //sort on endTimestamps
         if (previousEndTimestamps.size() > 1) {
-            previousEndTimestamps = previousEndTimestamps.entrySet().stream().sorted(Map.Entry.comparingByValue())
-                    .collect(toMap(e -> e.getKey(), e -> e.getValue(), (e1, e2) -> e1,
-                            LinkedHashMap::new));
+            List<Map.Entry<String, Long>> toSort = new ArrayList<>();
+            for (Map.Entry<String, Long> e : previousEndTimestamps.entrySet()) {
+                toSort.add(e);
+            }
+            toSort.sort(Map.Entry.comparingByValue());
+            LinkedHashMap<String, Long> map = new LinkedHashMap<>();
+            for (Map.Entry<String, Long> e : toSort) {
+                map.putIfAbsent(e.getKey(), e.getValue());
+            }
+            previousEndTimestamps = map;
         }
 
         for (Map.Entry<String, Long> entry : previousEndTimestamps.entrySet()) {
-            previousSession = sessionMap.get(entry.getKey()).getPreviousSession();
+            previousSession = state.sessionMap.get(entry.getKey()).getPreviousSession();
 
             if (previousSession != null && previousSession.getFirst() != null &&
                     eventTimestamp >= previousSession.getAliveTimestamp()) {
 
-                expiredEventChunk.setKey(previousSession.getKey());
-                expiredEventChunk.setTimestamps(previousSession.getStartTimestamp(),
+                state.expiredEventChunk.setKey(previousSession.getKey());
+                state.expiredEventChunk.setTimestamps(previousSession.getStartTimestamp(),
                         previousSession.getEndTimestamp(), previousSession.getAliveTimestamp());
 
-                expiredEventChunk.add(previousSession.getFirst());
+                state.expiredEventChunk.add(previousSession.getFirst());
                 previousSession.clear();
             } else {
                 break;
@@ -496,48 +505,51 @@ private void previousSessionTimeout(long eventTimestamp) {
     /**
      * Gets all end timestamps of current sessions.
      *
-     * @param sessionMap holds all the sessions with the session key
+     * @param state current state
      * @return map with the values of each current session's end timestamp and with the key as the session key
      */
-    private Map<String, Long> findAllCurrentEndTimestamps(Map<String, SessionContainer> sessionMap) {
+    private Map<String, Long> findAllCurrentEndTimestamps(WindowState state) {
 
-        Collection<SessionContainer> sessionContainerList = sessionMap.values();
+        Collection<SessionContainer> sessionContainerList = state.sessionMap.values();
 
-        if (!sessionKeyEndTimeMap.isEmpty()) {
-            sessionKeyEndTimeMap.clear();
+        if (!state.sessionKeyEndTimeMap.isEmpty()) {
+            state.sessionKeyEndTimeMap.clear();
         }
 
         for (SessionContainer sessionContainer : sessionContainerList) {
             //not getting empty session details
             if (sessionContainer.getCurrentSessionEndTimestamp() != -1) {
-                sessionKeyEndTimeMap.put(sessionContainer.getKey(), sessionContainer.getCurrentSessionEndTimestamp());
+                state.sessionKeyEndTimeMap.put(sessionContainer.getKey(),
+                        sessionContainer.getCurrentSessionEndTimestamp());
             }
         }
 
-        return sessionKeyEndTimeMap;
+        return state.sessionKeyEndTimeMap;
     }
 
     /**
      * Gets all the end timestamps of previous sessions.
      *
+     * @param state
      * @return map with the values of each previous session's end timestamp and with the key as the sesssio key
      */
-    private Map<String, Long> findAllPreviousEndTimestamps(Map<String, SessionContainer> sessionMap) {
+    private Map<String, Long> findAllPreviousEndTimestamps(WindowState state) {
 
-        Collection<SessionContainer> sessionContainerList = sessionMap.values();
+        Collection<SessionContainer> sessionContainerList = state.sessionMap.values();
 
-        if (!sessionKeyEndTimeMap.isEmpty()) {
-            sessionKeyEndTimeMap.clear();
+        if (!state.sessionKeyEndTimeMap.isEmpty()) {
+            state.sessionKeyEndTimeMap.clear();
         }
 
         for (SessionContainer sessionContainer : sessionContainerList) {
             //not getting empty session details
             if (sessionContainer.getPreviousSessionEndTimestamp() != -1) {
-                sessionKeyEndTimeMap.put(sessionContainer.getKey(), sessionContainer.getPreviousSessionEndTimestamp());
+                state.sessionKeyEndTimeMap.put(sessionContainer.getKey(),
+                        sessionContainer.getPreviousSessionEndTimestamp());
             }
         }
 
-        return sessionKeyEndTimeMap;
+        return state.sessionKeyEndTimeMap;
     }
 
     @Override
@@ -550,34 +562,19 @@ public void stop() {
         //Do nothing
     }
 
-    @Override
-    public synchronized Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("sessionMap", sessionMap);
-        state.put("sessionContainer", sessionContainer);
-        state.put("expiredEventChunk", expiredEventChunk);
-        return state;
-    }
-
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        sessionMap = (ConcurrentHashMap<String, SessionContainer>) state.get("sessionMap");
-        sessionContainer = (SessionContainer) state.get("sessionContainer");
-        expiredEventChunk = (SessionComplexEventChunk<StreamEvent>) state.get("expiredEventChunk");
-    }
-
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventChunk, streamEventCloner);
-    }
-
     @Override
     public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
                                               List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(expiredEventChunk, condition, matchingMetaInfoHolder,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventChunk, condition, matchingMetaInfoHolder,
                 variableExpressionExecutors, tableMap, siddhiQueryContext);
+    }
 
+    @Override
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventChunk, streamEventCloner);
     }
 
     /**
@@ -639,4 +636,42 @@ public void setTimestamps(long startTimestamp, long endTimestamp, long aliveTime
             this.aliveTimestamp = aliveTimestamp;
         }
     }
+
+    class WindowState extends State {
+
+        private Map<String, SessionContainer> sessionMap;
+        private Map<String, Long> sessionKeyEndTimeMap;
+        private SessionContainer sessionContainer;
+        private SessionComplexEventChunk<StreamEvent> expiredEventChunk;
+
+        public WindowState() {
+            this.sessionMap = new ConcurrentHashMap<>();
+            this.sessionKeyEndTimeMap = new HashMap<>();
+            this.sessionContainer = new SessionContainer();
+            this.expiredEventChunk = new SessionComplexEventChunk<>();
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return sessionMap.isEmpty() && expiredEventChunk.getFirst() == null
+                    && sessionContainer.getCurrentSession().getFirst() == null
+                    && sessionContainer.getPreviousSession().getFirst() == null;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("sessionMap", sessionMap);
+            state.put("sessionContainer", sessionContainer);
+            state.put("expiredEventChunk", expiredEventChunk);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            sessionMap = (ConcurrentHashMap<String, SessionContainer>) state.get("sessionMap");
+            sessionContainer = (SessionContainer) state.get("sessionContainer");
+            expiredEventChunk = (SessionComplexEventChunk<StreamEvent>) state.get("expiredEventChunk");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SlidingFindableWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SlidingFindableWindowProcessor.java
new file mode 100644
index 0000000000..c7a48b9d00
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SlidingFindableWindowProcessor.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.query.processor.stream.window;
+
+import io.siddhi.core.config.SiddhiQueryContext;
+import io.siddhi.core.event.state.StateEvent;
+import io.siddhi.core.event.stream.StreamEvent;
+import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.executor.VariableExpressionExecutor;
+import io.siddhi.core.table.Table;
+import io.siddhi.core.util.collection.operator.CompiledCondition;
+import io.siddhi.core.util.collection.operator.MatchingMetaInfoHolder;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.query.api.expression.Expression;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Performs event processing in a sliding manner while supporting event search
+ *
+ * @param <S> current state of the processor
+ */
+public abstract class SlidingFindableWindowProcessor<S extends State> extends SlidingWindowProcessor<S>
+        implements FindableProcessor {
+
+    @Override
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
+        S state = stateHolder.getState();
+        try {
+            return compileCondition(condition, matchingMetaInfoHolder, variableExpressionExecutors, tableMap,
+                    state, siddhiQueryContext);
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    @Override
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
+        S state = stateHolder.getState();
+        try {
+            return find(matchingEvent, compiledCondition, streamEventClonerHolder.getStreamEventCloner(),
+                    state);
+        } finally {
+            stateHolder.returnState(state);
+        }
+
+    }
+
+    /**
+     * To construct a finder having the capability of finding events at the processor that corresponds to the incoming
+     * matchingEvent and the given matching expression logic.
+     *
+     * @param condition                   the matching condition
+     * @param matchingMetaInfoHolder      the meta structure of the incoming matchingEvent
+     * @param variableExpressionExecutors the list of variable ExpressionExecutors already created
+     * @param tableMap                    map of event tables
+     * @param state                       current query state
+     * @param siddhiQueryContext          current siddhi query context
+     * @return compiled Condition having the capability of matching events against the incoming matchingEvent
+     */
+    public abstract CompiledCondition compileCondition(Expression condition,
+                                                       MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                                       List<VariableExpressionExecutor> variableExpressionExecutors,
+                                                       Map<String, Table> tableMap, S state,
+                                                       SiddhiQueryContext siddhiQueryContext);
+
+    /**
+     * To find events from the processor event pool, that the matches the matchingEvent based on finder logic.
+     *
+     * @param matchingEvent     the event to be matched with the events at the processor
+     * @param compiledCondition the execution element responsible for matching the corresponding events that matches
+     *                          the matchingEvent based on pool of events at Processor
+     * @param streamEventCloner stream event cloner
+     * @param state             current query state  @return the matched events
+     */
+    public abstract StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                                     StreamEventCloner streamEventCloner, S state);
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SlidingWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SlidingWindowProcessor.java
index ae6fb7def9..9bf1a24bb8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SlidingWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SlidingWindowProcessor.java
@@ -23,30 +23,31 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.AbstractDefinition;
-import io.siddhi.query.api.definition.Attribute;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Performs event processing in a sliding manner
+ *
+ * @param <S> current state of the processor
  */
-public abstract class SlidingWindowProcessor extends WindowProcessor {
+public abstract class SlidingWindowProcessor<S extends State> extends WindowProcessor<S> {
 
     @Override
-    protected List<Attribute> init(MetaStreamEvent metaStreamEvent,
+    protected StateFactory<S> init(MetaStreamEvent metaStreamEvent,
                                    AbstractDefinition inputDefinition,
                                    ExpressionExecutor[] attributeExpressionExecutors,
-                                   ConfigReader configReader,
-                                   boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
-        init(attributeExpressionExecutors, configReader, siddhiQueryContext);
-        return new ArrayList<Attribute>(0);
+                                   ConfigReader configReader, StreamEventClonerHolder streamEventClonerHolder,
+                                   boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                   SiddhiQueryContext siddhiQueryContext) {
+        return init(attributeExpressionExecutors, configReader, siddhiQueryContext);
     }
 
     /**
@@ -56,14 +57,16 @@ protected List<Attribute> init(MetaStreamEvent metaStreamEvent,
      * @param configReader                 the config reader of window
      * @param siddhiQueryContext           the context of the siddhi query
      */
-    protected abstract void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                                 SiddhiQueryContext siddhiQueryContext);
+    protected abstract StateFactory<S> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                            ConfigReader configReader,
+                                            SiddhiQueryContext siddhiQueryContext);
 
     @Override
     protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater) {
+                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater,
+                                     S state) {
         streamEventChunk.reset();
-        process(streamEventChunk, nextProcessor, streamEventCloner);
+        process(streamEventChunk, nextProcessor, streamEventCloner, state);
     }
 
     /**
@@ -72,9 +75,10 @@ protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk
      * @param streamEventChunk  the stream event chunk that need to be processed
      * @param nextProcessor     the next processor to which the success events need to be passed
      * @param streamEventCloner helps to clone the incoming event for local storage or modification
+     * @param state             current query state
      */
     protected abstract void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                    StreamEventCloner streamEventCloner);
+                                    StreamEventCloner streamEventCloner, S state);
 
     @Override
     public ProcessingMode getProcessingMode() {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SortWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SortWindowProcessor.java
index 252b1e0349..68015bd26a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SortWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SortWindowProcessor.java
@@ -37,6 +37,8 @@
 import io.siddhi.core.util.collection.operator.Operator;
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.expression.Expression;
 
@@ -92,17 +94,16 @@
                         "Therefore, at any given time, the window contains the 5 lowest prices."
         )
 )
-public class SortWindowProcessor extends SlidingWindowProcessor implements FindableProcessor {
+public class SortWindowProcessor extends SlidingFindableWindowProcessor<SortWindowProcessor.WindowState> {
     private static final String ASC = "asc";
     private static final String DESC = "desc";
     private int lengthToKeep;
-    private List<StreamEvent> sortedWindow = new ArrayList<StreamEvent>();
     private List<Object[]> parameterInfo;
     private EventComparator eventComparator;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors[0].getReturnType() == Attribute.Type.INT) {
             lengthToKeep = Integer.parseInt(String.valueOf(((ConstantExpressionExecutor)
                     attributeExpressionExecutors[0]).getValue()));
@@ -138,14 +139,15 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                 parameterInfo.add(new Object[]{variableExpressionExecutor, order});
             }
         }
-
+        return () -> new WindowState();
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
+
 
-        synchronized (this) {
+        synchronized (state) {
             long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
 
             StreamEvent streamEvent = streamEventChunk.getFirst();
@@ -158,10 +160,10 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                 streamEvent.setNext(null);
                 streamEventChunk.add(streamEvent);
 
-                sortedWindow.add(clonedEvent);
-                if (sortedWindow.size() > lengthToKeep) {
-                    Collections.sort(sortedWindow, eventComparator);
-                    StreamEvent expiredEvent = sortedWindow.remove(sortedWindow.size() - 1);
+                state.sortedWindow.add(clonedEvent);
+                if (state.sortedWindow.size() > lengthToKeep) {
+                    Collections.sort(state.sortedWindow, eventComparator);
+                    StreamEvent expiredEvent = state.sortedWindow.remove(state.sortedWindow.size() - 1);
                     expiredEvent.setTimestamp(currentTime);
                     streamEventChunk.add(expiredEvent);
                 }
@@ -183,31 +185,19 @@ public void stop() {
     }
 
     @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("SortedWindow", sortedWindow);
-        }
-        return state;
-    }
-
-
-    @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        sortedWindow = (List<StreamEvent>) state.get("SortedWindow");
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.sortedWindow, condition, matchingMetaInfoHolder,
+                variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
     @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, sortedWindow, streamEventCloner);
-    }
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.sortedWindow, streamEventCloner);
 
-    @Override
-    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
-                                              List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(sortedWindow, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
     private class EventComparator implements Comparator<StreamEvent> {
@@ -227,4 +217,26 @@ public int compare(StreamEvent e1, StreamEvent e2) {
         }
     }
 
+    class WindowState extends State {
+        private List<StreamEvent> sortedWindow = new ArrayList<StreamEvent>();
+
+        @Override
+        public boolean canDestroy() {
+            return sortedWindow.isEmpty();
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("SortedWindow", sortedWindow);
+            }
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            sortedWindow = (List<StreamEvent>) state.get("SortedWindow");
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TableWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TableWindowProcessor.java
index 2abb9327ae..571362a31b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TableWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TableWindowProcessor.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.exception.SiddhiAppRuntimeException;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.query.processor.Processor;
@@ -30,6 +30,8 @@
 import io.siddhi.core.util.collection.operator.CompiledCondition;
 import io.siddhi.core.util.collection.operator.MatchingMetaInfoHolder;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.expression.Expression;
 
 import java.util.List;
@@ -41,8 +43,6 @@
 public class TableWindowProcessor extends BatchingWindowProcessor implements FindableProcessor {
 
     private Table table;
-    private boolean outputExpectsExpiredEvents;
-    private ConfigReader configReader;
 
     public TableWindowProcessor(Table table) {
         this.table = table;
@@ -50,18 +50,19 @@ public TableWindowProcessor(Table table) {
 
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
-        this.configReader = configReader;
-        this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                StreamEventClonerHolder streamEventClonerHolder, boolean outputExpectsExpiredEvents,
+                                boolean findToBeExecuted, SiddhiQueryContext siddhiQueryContext) {
+        return null;
     }
 
     @Override
-    protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
+    protected void process(ComplexEventChunk streamEventChunk, Processor nextProcessor,
+                           StreamEventCloner streamEventCloner, State state) {
         // nothing to be done
     }
 
+
     @Override
     public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
         return table.find(matchingEvent, compiledCondition);
@@ -84,39 +85,4 @@ public void start() {
     public void stop() {
         //Do nothing
     }
-
-    @Override
-    public Processor cloneProcessor(String key) {
-        try {
-            TableWindowProcessor streamProcessor = new TableWindowProcessor(table);
-            streamProcessor.inputDefinition = inputDefinition;
-            ExpressionExecutor[] innerExpressionExecutors = new ExpressionExecutor[attributeExpressionLength];
-            ExpressionExecutor[] attributeExpressionExecutors1 = this.attributeExpressionExecutors;
-            for (int i = 0; i < attributeExpressionLength; i++) {
-                innerExpressionExecutors[i] = attributeExpressionExecutors1[i].cloneExecutor(key);
-            }
-            streamProcessor.attributeExpressionExecutors = innerExpressionExecutors;
-            streamProcessor.attributeExpressionLength = attributeExpressionLength;
-            streamProcessor.additionalAttributes = additionalAttributes;
-            streamProcessor.complexEventPopulater = complexEventPopulater;
-            streamProcessor.init(metaStreamEvent, inputDefinition, attributeExpressionExecutors, configReader,
-                    outputExpectsExpiredEvents, siddhiQueryContext);
-            streamProcessor.start();
-            return streamProcessor;
-
-        } catch (Exception e) {
-            throw new SiddhiAppRuntimeException("Exception in cloning " + this.getClass().getCanonicalName(), e);
-        }
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        //No state
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
index b2c1a9491c..9cba64a1cc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
@@ -28,6 +28,7 @@
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
 import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -41,6 +42,8 @@
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
@@ -110,14 +113,11 @@
                 )
         }
 )
-public class TimeBatchWindowProcessor extends BatchingWindowProcessor
+public class TimeBatchWindowProcessor extends BatchingFindableWindowProcessor<TimeBatchWindowProcessor.WindowState>
         implements SchedulingProcessor, FindableProcessor {
 
     private long timeInMilliSeconds;
     private long nextEmitTime = -1;
-    private SnapshotableStreamEventQueue currentEventQueue = null;
-    private SnapshotableStreamEventQueue expiredEventQueue = null;
-    private StreamEvent resetEvent = null;
     private Scheduler scheduler;
     private boolean outputExpectsExpiredEvents;
     private SiddhiQueryContext siddhiQueryContext;
@@ -140,16 +140,12 @@ public void setScheduler(Scheduler scheduler) {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader, boolean
-            outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                StreamEventClonerHolder streamEventClonerHolder, boolean
+                                        outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                SiddhiQueryContext siddhiQueryContext) {
         this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
         this.siddhiQueryContext = siddhiQueryContext;
-        if (!isStreamCurrentEvents) {
-            this.currentEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
-        }
-        if (outputExpectsExpiredEvents) {
-            this.expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
-        }
         if (attributeExpressionExecutors.length == 1) {
             initTimeParameter(attributeExpressionExecutors[0]);
         } else if (attributeExpressionExecutors.length == 2) {
@@ -221,6 +217,8 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                     attributeExpressionExecutors.length + " input " +
                     "attributes");
         }
+        return () -> new WindowState(streamEventClonerHolder, outputExpectsExpiredEvents, findToBeExecuted);
+
     }
 
     private void initTimeParameter(ExpressionExecutor attributeExpressionExecutor) {
@@ -243,11 +241,10 @@ private void initTimeParameter(ExpressionExecutor attributeExpressionExecutor) {
         }
     }
 
-
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
-        synchronized (this) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
+        synchronized (state) {
             if (nextEmitTime == -1) {
                 long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
                 if (isStartTimeEnabled) {
@@ -275,47 +272,47 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                     continue;
                 }
                 StreamEvent clonedStreamEvent = streamEventCloner.copyStreamEvent(streamEvent);
-                if (resetEvent == null) {
-                    resetEvent = streamEventCloner.copyStreamEvent(streamEvent);
-                    resetEvent.setType(ComplexEvent.Type.RESET);
+                if (state.resetEvent == null) {
+                    state.resetEvent = streamEventCloner.copyStreamEvent(streamEvent);
+                    state.resetEvent.setType(ComplexEvent.Type.RESET);
                 }
                 if (!isStreamCurrentEvents) {
-                    currentEventQueue.add(clonedStreamEvent);
-                } else if (expiredEventQueue != null) {
+                    state.currentEventQueue.add(clonedStreamEvent);
+                } else if (state.expiredEventQueue != null) {
                     clonedStreamEvent.setType(StreamEvent.Type.EXPIRED);
-                    expiredEventQueue.add(clonedStreamEvent);
+                    state.expiredEventQueue.add(clonedStreamEvent);
                 }
             }
             if (!isStreamCurrentEvents) {
                 streamEventChunk.clear();
             }
             if (sendEvents) {
-                if (outputExpectsExpiredEvents && expiredEventQueue.getFirst() != null) {
-                    while (expiredEventQueue.hasNext()) {
-                        StreamEvent expiredEvent = expiredEventQueue.next();
+                if (outputExpectsExpiredEvents && state.expiredEventQueue.getFirst() != null) {
+                    while (state.expiredEventQueue.hasNext()) {
+                        StreamEvent expiredEvent = state.expiredEventQueue.next();
                         expiredEvent.setTimestamp(currentTime);
                     }
-                    streamEventChunk.add(expiredEventQueue.getFirst());
-                    expiredEventQueue.clear();
+                    streamEventChunk.add(state.expiredEventQueue.getFirst());
+                    state.expiredEventQueue.clear();
                 }
 
-                if (resetEvent != null) {
-                    streamEventChunk.add(resetEvent);
-                    resetEvent = null;
+                if (state.resetEvent != null) {
+                    streamEventChunk.add(state.resetEvent);
+                    state.resetEvent = null;
                 }
 
-                if (currentEventQueue != null && currentEventQueue.getFirst() != null) {
-                    if (expiredEventQueue != null) {
-                        currentEventQueue.reset();
-                        while (currentEventQueue.hasNext()) {
-                            StreamEvent currentEvent = currentEventQueue.next();
+                if (state.currentEventQueue != null && state.currentEventQueue.getFirst() != null) {
+                    if (state.expiredEventQueue != null) {
+                        state.currentEventQueue.reset();
+                        while (state.currentEventQueue.hasNext()) {
+                            StreamEvent currentEvent = state.currentEventQueue.next();
                             StreamEvent toExpireEvent = streamEventCloner.copyStreamEvent(currentEvent);
                             toExpireEvent.setType(StreamEvent.Type.EXPIRED);
-                            expiredEventQueue.add(toExpireEvent);
+                            state.expiredEventQueue.add(toExpireEvent);
                         }
                     }
-                    streamEventChunk.add(currentEventQueue.getFirst());
-                    currentEventQueue.clear();
+                    streamEventChunk.add(state.currentEventQueue.getFirst());
+                    state.currentEventQueue.clear();
                 }
             }
         }
@@ -345,41 +342,62 @@ public void stop() {
     }
 
     @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        synchronized (this) {
-            state.put("CurrentEventQueue", currentEventQueue != null ? currentEventQueue.getSnapshot() : null);
-            state.put("ExpiredEventQueue", expiredEventQueue != null ? expiredEventQueue.getSnapshot() : null);
-            state.put("ResetEvent", resetEvent);
-        }
-        return state;
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventQueue, condition, matchingMetaInfoHolder,
+                variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
+
     @Override
-    public synchronized void restoreState(Map<String, Object> state) {
-        if (expiredEventQueue != null) {
-            expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventQueue, streamEventCloner);
+    }
+
+    class WindowState extends State {
+        private SnapshotableStreamEventQueue currentEventQueue;
+        private SnapshotableStreamEventQueue expiredEventQueue;
+        private StreamEvent resetEvent = null;
+
+        WindowState(StreamEventClonerHolder streamEventClonerHolder,
+                    boolean outputExpectsExpiredEvents, boolean findToBeExecuted) {
+            if (!isStreamCurrentEvents) {
+                this.currentEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+            }
+            if (outputExpectsExpiredEvents || findToBeExecuted) {
+                this.expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+            }
         }
-        if (currentEventQueue != null) {
-            currentEventQueue.restore((SnapshotStateList) state.get("CurrentEventQueue"));
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            synchronized (this) {
+                state.put("CurrentEventQueue", currentEventQueue != null ? currentEventQueue.getSnapshot() : null);
+                state.put("ExpiredEventQueue", expiredEventQueue != null ? expiredEventQueue.getSnapshot() : null);
+                state.put("ResetEvent", resetEvent);
+            }
+            return state;
         }
-        resetEvent = (StreamEvent) state.get("ResetEvent");
-    }
 
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventQueue, streamEventCloner);
-    }
+        public void restore(Map<String, Object> state) {
+            if (expiredEventQueue != null) {
+                expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+            }
+            if (currentEventQueue != null) {
+                currentEventQueue.restore((SnapshotStateList) state.get("CurrentEventQueue"));
+            }
+            resetEvent = (StreamEvent) state.get("ResetEvent");
+        }
 
-    @Override
-    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
-                                              List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        if (expiredEventQueue == null) {
-            expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+        @Override
+        public boolean canDestroy() {
+            return (currentEventQueue == null || currentEventQueue.getFirst() == null)
+                    && (expiredEventQueue == null || expiredEventQueue.getFirst() == null)
+                    && resetEvent == null;
         }
-        return OperatorParser.constructOperator(expiredEventQueue, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap,
-                siddhiQueryContext);
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeLengthWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeLengthWindowProcessor.java
index ce56f18a43..34ff7e450b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeLengthWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeLengthWindowProcessor.java
@@ -27,6 +27,8 @@
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -39,6 +41,9 @@
 import io.siddhi.core.util.collection.operator.Operator;
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
+import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
@@ -77,13 +82,11 @@
                         "last 2 seconds and gets updated for every event arrival and expiry."
         )
 )
-public class TimeLengthWindowProcessor extends SlidingWindowProcessor
-        implements SchedulingProcessor, FindableProcessor {
+public class TimeLengthWindowProcessor extends SlidingFindableWindowProcessor<TimeLengthWindowProcessor.WindowState>
+        implements SchedulingProcessor {
 
     private long timeInMilliSeconds;
     private int length;
-    private int count = 0;
-    private ComplexEventChunk<StreamEvent> expiredEventChunk;
     private Scheduler scheduler;
     private SiddhiQueryContext siddhiQueryContext;
 
@@ -98,10 +101,9 @@ public void setScheduler(Scheduler scheduler) {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         this.siddhiQueryContext = siddhiQueryContext;
-        expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
         if (attributeExpressionExecutors.length == 2) {
             length = (Integer) ((ConstantExpressionExecutor) attributeExpressionExecutors[1]).getValue();
             if (attributeExpressionExecutors[0] instanceof ConstantExpressionExecutor) {
@@ -126,24 +128,27 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                     "windowTime,<int> windowLength), but found " + attributeExpressionExecutors.length + " input " +
                     "attributes");
         }
+        return () -> new WindowState(streamEventClonerHolder);
+
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
-        synchronized (this) {
+                           StreamEventCloner streamEventCloner, WindowState state) {
+
+        synchronized (state) {
             long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
 
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
 
-                expiredEventChunk.reset();
-                while (expiredEventChunk.hasNext()) {
-                    StreamEvent expiredEvent = expiredEventChunk.next();
+                state.expiredEventQueue.reset();
+                while (state.expiredEventQueue.hasNext()) {
+                    StreamEvent expiredEvent = state.expiredEventQueue.next();
                     long timeDiff = expiredEvent.getTimestamp() - currentTime + timeInMilliSeconds;
                     if (timeDiff <= 0) {
-                        expiredEventChunk.remove();
-                        count--;
+                        state.expiredEventQueue.remove();
+                        state.count--;
                         expiredEvent.setTimestamp(currentTime);
                         streamEventChunk.insertBeforeCurrent(expiredEvent);
                     } else {
@@ -151,20 +156,20 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                     }
                 }
 
-                expiredEventChunk.reset();
+                state.expiredEventQueue.reset();
 
                 if (streamEvent.getType() == StreamEvent.Type.CURRENT) {
                     StreamEvent clonedEvent = streamEventCloner.copyStreamEvent(streamEvent);
                     clonedEvent.setType(StreamEvent.Type.EXPIRED);
-                    if (count < length) {
-                        count++;
-                        this.expiredEventChunk.add(clonedEvent);
+                    if (state.count < length) {
+                        state.count++;
+                        state.expiredEventQueue.add(clonedEvent);
                     } else {
-                        StreamEvent firstEvent = this.expiredEventChunk.poll();
+                        StreamEvent firstEvent = state.expiredEventQueue.poll();
                         if (firstEvent != null) {
                             firstEvent.setTimestamp(currentTime);
                             streamEventChunk.insertBeforeCurrent(firstEvent);
-                            this.expiredEventChunk.add(clonedEvent);
+                            state.expiredEventQueue.add(clonedEvent);
                         }
                     }
                     scheduler.notifyAt(clonedEvent.getTimestamp() + timeInMilliSeconds);
@@ -179,20 +184,21 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
         }
     }
 
-
-    @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventChunk, streamEventCloner);
-    }
-
     @Override
     public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
                                               List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(expiredEventChunk, condition, matchingMetaInfoHolder,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventQueue, condition, matchingMetaInfoHolder,
                 variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
+    @Override
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventQueue, streamEventCloner);
+    }
+
     @Override
     public void start() {
         //Do nothing
@@ -203,18 +209,31 @@ public void stop() {
         //Do nothing
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("ExpiredEventChunk", expiredEventChunk.getFirst());
-        return state;
-    }
+    class WindowState extends State {
+        private SnapshotableStreamEventQueue expiredEventQueue;
+        private int count = 0;
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        expiredEventChunk.clear();
-        expiredEventChunk.add((StreamEvent) state.get("ExpiredEventChunk"));
-    }
+        WindowState(StreamEventClonerHolder streamEventClonerHolder) {
+            expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
+            state.put("Count", count);
+            return state;
+        }
+
+        public void restore(Map<String, Object> state) {
+            expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+            count = (Integer) state.get("ExpiredEventQueue");
+        }
 
+        @Override
+        public boolean canDestroy() {
+            return expiredEventQueue.getFirst() == null && count == 0;
+        }
+    }
 }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
index 198025d841..259d2a0808 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
@@ -27,6 +27,7 @@
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
 import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -40,6 +41,8 @@
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.OperatorParser;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 import io.siddhi.query.api.expression.Expression;
@@ -76,17 +79,12 @@
                 )
         }
 )
-public class TimeWindowProcessor extends SlidingWindowProcessor implements SchedulingProcessor, FindableProcessor {
+public class TimeWindowProcessor extends SlidingFindableWindowProcessor<TimeWindowProcessor.WindowState>
+        implements SchedulingProcessor {
 
     private long timeInMilliSeconds;
-    private SnapshotableStreamEventQueue expiredEventQueue;
     private Scheduler scheduler;
     private SiddhiQueryContext siddhiQueryContext;
-    private volatile long lastTimestamp = Long.MIN_VALUE;
-
-    public void setTimeInMilliSeconds(long timeInMilliSeconds) {
-        this.timeInMilliSeconds = timeInMilliSeconds;
-    }
 
     @Override
     public Scheduler getScheduler() {
@@ -99,10 +97,10 @@ public void setScheduler(Scheduler scheduler) {
     }
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<WindowState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                             ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
         this.siddhiQueryContext = siddhiQueryContext;
-        this.expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+
         if (attributeExpressionExecutors.length == 1) {
             if (attributeExpressionExecutors[0] instanceof ConstantExpressionExecutor) {
                 if (attributeExpressionExecutors[0].getReturnType() == Attribute.Type.INT) {
@@ -124,13 +122,14 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
             throw new SiddhiAppValidationException("Time window should only have one parameter (<int|long|time> " +
                     "windowTime), but found " + attributeExpressionExecutors.length + " input attributes");
         }
+        return () -> new WindowState(streamEventClonerHolder);
     }
 
     @Override
     protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                           StreamEventCloner streamEventCloner) {
-        synchronized (this) {
-
+                           StreamEventCloner streamEventCloner, WindowState state) {
+        synchronized (state) {
+            SnapshotableStreamEventQueue expiredEventQueue = state.expiredEventQueue;
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
                 long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
@@ -149,14 +148,12 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                 }
 
                 if (streamEvent.getType() == StreamEvent.Type.CURRENT) {
-
                     StreamEvent clonedEvent = streamEventCloner.copyStreamEvent(streamEvent);
                     clonedEvent.setType(StreamEvent.Type.EXPIRED);
-                    this.expiredEventQueue.add(clonedEvent);
-
-                    if (lastTimestamp < clonedEvent.getTimestamp()) {
+                    expiredEventQueue.add(clonedEvent);
+                    if (state.lastTimestamp < clonedEvent.getTimestamp()) {
                         scheduler.notifyAt(clonedEvent.getTimestamp() + timeInMilliSeconds);
-                        lastTimestamp = clonedEvent.getTimestamp();
+                        state.lastTimestamp = clonedEvent.getTimestamp();
                     }
                 } else {
                     streamEventChunk.remove();
@@ -168,16 +165,18 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
     }
 
     @Override
-    public synchronized StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
-        return ((Operator) compiledCondition).find(matchingEvent, expiredEventQueue, streamEventCloner);
+    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
+                                              List<VariableExpressionExecutor> variableExpressionExecutors,
+                                              Map<String, Table> tableMap, WindowState state,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        return OperatorParser.constructOperator(state.expiredEventQueue, condition,
+                matchingMetaInfoHolder, variableExpressionExecutors, tableMap, siddhiQueryContext);
     }
 
     @Override
-    public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
-                                              List<VariableExpressionExecutor> variableExpressionExecutors,
-                                              Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(expiredEventQueue, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap, siddhiQueryContext);
+    public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition,
+                            StreamEventCloner streamEventCloner, WindowState state) {
+        return ((Operator) compiledCondition).find(matchingEvent, state.expiredEventQueue, streamEventCloner);
     }
 
     @Override
@@ -190,15 +189,31 @@ public void stop() {
         //Do nothing
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
-        return state;
-    }
+    class WindowState extends State {
+        private SnapshotableStreamEventQueue expiredEventQueue;
+        private volatile long lastTimestamp = Long.MIN_VALUE;
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+
+        WindowState(StreamEventClonerHolder streamEventClonerHolder) {
+            expiredEventQueue = new SnapshotableStreamEventQueue(streamEventClonerHolder);
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
+            state.put("LastTimestamp", lastTimestamp);
+            return state;
+        }
+
+        public void restore(Map<String, Object> state) {
+            expiredEventQueue.restore((SnapshotStateList) state.get("ExpiredEventQueue"));
+            lastTimestamp = (long) state.get("LastTimestamp");
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return expiredEventQueue.getFirst() == null;
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/WindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/WindowProcessor.java
index 0b1c9903f3..ee1fb1601f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/WindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/WindowProcessor.java
@@ -18,11 +18,23 @@
 package io.siddhi.core.query.processor.stream.window;
 
 import io.siddhi.core.query.processor.stream.AbstractStreamProcessor;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.query.api.definition.Attribute;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Abstract parent implementation of Processor to represent Windows. Common window behaviors will be handled
  * here through this class and different implementations should extend this
+ *
+ * @param <S> current state of the processor
  */
-public abstract class WindowProcessor extends AbstractStreamProcessor {
+public abstract class WindowProcessor<S extends State> extends AbstractStreamProcessor<S> {
+
 
+    @Override
+    public List<Attribute> getReturnAttributes() {
+        return new ArrayList<>(0);
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/WindowWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/WindowWindowProcessor.java
index a46d9c7f28..4ddf20208c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/WindowWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/WindowWindowProcessor.java
@@ -22,8 +22,8 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
+import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
-import io.siddhi.core.exception.SiddhiAppRuntimeException;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.query.input.stream.join.JoinProcessor;
@@ -33,12 +33,12 @@
 import io.siddhi.core.util.collection.operator.CompiledCondition;
 import io.siddhi.core.util.collection.operator.MatchingMetaInfoHolder;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.core.window.Window;
 import io.siddhi.query.api.definition.AbstractDefinition;
-import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.expression.Expression;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -56,31 +56,30 @@ public class WindowWindowProcessor extends WindowProcessor implements FindablePr
      * {@link Window} from which the events have to be found.
      */
     private Window window;
-    private ConfigReader configReader;
-    private boolean outputExpectsExpiredEvents;
 
     public WindowWindowProcessor(Window window) {
         this.window = window;
     }
 
     @Override
-    protected List<Attribute> init(MetaStreamEvent metaStreamEvent,
-                                   AbstractDefinition inputDefinition,
-                                   ExpressionExecutor[] attributeExpressionExecutors,
-                                   ConfigReader configReader,
-                                   boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
-        this.configReader = configReader;
-        this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
-        return new ArrayList<Attribute>(0);
+    protected StateFactory init(MetaStreamEvent metaStreamEvent,
+                                AbstractDefinition inputDefinition,
+                                ExpressionExecutor[] attributeExpressionExecutors,
+                                ConfigReader configReader, StreamEventClonerHolder streamEventClonerHolder,
+                                boolean outputExpectsExpiredEvents, boolean findToBeExecuted,
+                                SiddhiQueryContext siddhiQueryContext) {
+        return null;
     }
 
     @Override
-    protected void processEventChunk(ComplexEventChunk<StreamEvent> streamEventChunk, Processor nextProcessor,
-                                     StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater) {
+    protected void processEventChunk(ComplexEventChunk streamEventChunk, Processor nextProcessor,
+                                     StreamEventCloner streamEventCloner,
+                                     ComplexEventPopulater complexEventPopulater, State state) {
         streamEventChunk.reset();
         nextProcessor.process(streamEventChunk);
     }
 
+
     @Override
     public StreamEvent find(StateEvent matchingEvent, CompiledCondition compiledCondition) {
         return window.find(matchingEvent, compiledCondition);
@@ -104,43 +103,9 @@ public void stop() {
         //Do nothing
     }
 
-    @Override
-    public Processor cloneProcessor(String key) {
-        try {
-            WindowWindowProcessor streamProcessor = new WindowWindowProcessor(window);
-            streamProcessor.inputDefinition = inputDefinition;
-            ExpressionExecutor[] innerExpressionExecutors = new ExpressionExecutor[attributeExpressionLength];
-            ExpressionExecutor[] attributeExpressionExecutors1 = this.attributeExpressionExecutors;
-            for (int i = 0; i < attributeExpressionLength; i++) {
-                innerExpressionExecutors[i] = attributeExpressionExecutors1[i].cloneExecutor(key);
-            }
-            streamProcessor.attributeExpressionExecutors = innerExpressionExecutors;
-            streamProcessor.attributeExpressionLength = attributeExpressionLength;
-            streamProcessor.additionalAttributes = additionalAttributes;
-            streamProcessor.complexEventPopulater = complexEventPopulater;
-            streamProcessor.init(metaStreamEvent, inputDefinition, attributeExpressionExecutors, configReader,
-                    outputExpectsExpiredEvents, siddhiQueryContext);
-            streamProcessor.start();
-            return streamProcessor;
-
-        } catch (Exception e) {
-            throw new SiddhiAppRuntimeException("Exception in cloning " + this.getClass().getCanonicalName(), e);
-        }
-    }
-
     @Override
     public ProcessingMode getProcessingMode() {
         return window.getProcessingMode();
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        //No state
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/GroupByKeyGenerator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/GroupByKeyGenerator.java
index 01141a1864..69c822ef57 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/GroupByKeyGenerator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/GroupByKeyGenerator.java
@@ -71,10 +71,4 @@ public String constructEventKey(ComplexEvent event) {
             return null;
         }
     }
-
-    public void clean() {
-        for (ExpressionExecutor expressionExecutor : groupByExecutors) {
-            expressionExecutor.clean();
-        }
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/QuerySelector.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/QuerySelector.java
index 147eb94b7e..91f926747f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/QuerySelector.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/QuerySelector.java
@@ -17,6 +17,7 @@
  */
 package io.siddhi.core.query.selector;
 
+import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
@@ -28,7 +29,6 @@
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.query.selector.attribute.processor.AttributeProcessor;
-import io.siddhi.core.query.selector.attribute.processor.executor.GroupByAggregationAttributeExecutor;
 import io.siddhi.core.util.SiddhiConstants;
 import io.siddhi.query.api.execution.query.selection.Selector;
 import org.apache.log4j.Logger;
@@ -74,7 +74,6 @@ public QuerySelector(String id, Selector selector, boolean currentOn, boolean ex
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
-
         if (log.isTraceEnabled()) {
             log.trace("event is processed by selector " + id + this);
         }
@@ -97,11 +96,9 @@ public void process(ComplexEventChunk complexEventChunk) {
         if (outputComplexEventChunk != null) {
             outputRateLimiter.process(outputComplexEventChunk);
         }
-
     }
 
     public ComplexEventChunk execute(ComplexEventChunk complexEventChunk) {
-
         if (log.isTraceEnabled()) {
             log.trace("event is executed by selector " + id + this);
         }
@@ -178,31 +175,32 @@ private ComplexEventChunk<ComplexEvent> processGroupBy(ComplexEventChunk complex
             while (complexEventChunk.hasNext()) {
                 ComplexEvent event = complexEventChunk.next();
                 switch (event.getType()) {
-
                     case CURRENT:
                     case EXPIRED:
                         eventPopulator.populateStateEvent(event);
-                        String groupedByKey = groupByKeyGenerator.constructEventKey(event);
-                        GroupByAggregationAttributeExecutor.getKeyThreadLocal().set(groupedByKey);
-
-                        for (AttributeProcessor attributeProcessor : attributeProcessorList) {
-                            attributeProcessor.process(event);
-                        }
-                        if ((event.getType() == StreamEvent.Type.CURRENT && currentOn) || (event.getType() ==
-                                StreamEvent.Type.EXPIRED && expiredOn)) {
-                            if (!(havingConditionExecutor != null && !havingConditionExecutor.execute(event))) {
-                                complexEventChunk.remove();
-                                if (limit == SiddhiConstants.UNKNOWN_STATE) {
-                                    currentComplexEventChunk.add(new GroupedComplexEvent(groupedByKey, event));
-                                } else {
-                                    if (limitCount < limit) {
-                                        currentComplexEventChunk.add(new GroupedComplexEvent(groupedByKey, event));
-                                        limitCount++;
+                        String groupByKey = groupByKeyGenerator.constructEventKey(event);
+                        SiddhiAppContext.startGroupByFlow(groupByKey);
+                        try {
+                            for (AttributeProcessor attributeProcessor : attributeProcessorList) {
+                                attributeProcessor.process(event);
+                            }
+                            if ((event.getType() == StreamEvent.Type.CURRENT && currentOn) || (event.getType() ==
+                                    StreamEvent.Type.EXPIRED && expiredOn)) {
+                                if (!(havingConditionExecutor != null && !havingConditionExecutor.execute(event))) {
+                                    complexEventChunk.remove();
+                                    if (limit == SiddhiConstants.UNKNOWN_STATE) {
+                                        currentComplexEventChunk.add(new GroupedComplexEvent(groupByKey, event));
+                                    } else {
+                                        if (limitCount < limit) {
+                                            currentComplexEventChunk.add(new GroupedComplexEvent(groupByKey, event));
+                                            limitCount++;
+                                        }
                                     }
                                 }
                             }
+                        } finally {
+                            SiddhiAppContext.stopGroupByFlow();
                         }
-                        GroupByAggregationAttributeExecutor.getKeyThreadLocal().remove();
                         break;
                     case TIMER:
                         break;
@@ -212,6 +210,7 @@ private ComplexEventChunk<ComplexEvent> processGroupBy(ComplexEventChunk complex
                         }
                         break;
                 }
+
             }
         }
         if (isOrderBy) {
@@ -287,20 +286,21 @@ private ComplexEventChunk processInBatchGroupBy(ComplexEventChunk complexEventCh
                     case EXPIRED:
                         eventPopulator.populateStateEvent(event);
                         String groupByKey = groupByKeyGenerator.constructEventKey(event);
-                        GroupByAggregationAttributeExecutor.getKeyThreadLocal().set(groupByKey);
-
-                        for (AttributeProcessor attributeProcessor : attributeProcessorList) {
-                            attributeProcessor.process(event);
-                        }
-
-                        if (!(havingConditionExecutor != null && !havingConditionExecutor.execute(event))) {
-                            if ((event.getType() == StreamEvent.Type.CURRENT && currentOn) || (event.getType() ==
-                                    StreamEvent.Type.EXPIRED && expiredOn)) {
-                                complexEventChunk.remove();
-                                groupedEvents.put(groupByKey, event);
+                        SiddhiAppContext.startGroupByFlow(groupByKey);
+                        try {
+                            for (AttributeProcessor attributeProcessor : attributeProcessorList) {
+                                attributeProcessor.process(event);
+                            }
+                            if (!(havingConditionExecutor != null && !havingConditionExecutor.execute(event))) {
+                                if ((event.getType() == StreamEvent.Type.CURRENT && currentOn) || (event.getType() ==
+                                        StreamEvent.Type.EXPIRED && expiredOn)) {
+                                    complexEventChunk.remove();
+                                    groupedEvents.put(groupByKey, event);
+                                }
                             }
+                        } finally {
+                            SiddhiAppContext.stopGroupByFlow();
                         }
-                        GroupByAggregationAttributeExecutor.getKeyThreadLocal().remove();
                         break;
                     case TIMER:
                         break;
@@ -361,25 +361,6 @@ public void setToLast(Processor processor) {
         }
     }
 
-    @Override
-    public Processor cloneProcessor(String key) {
-        return null;
-    }
-
-    @Override
-    public void clean() {
-        for (AttributeProcessor processor : attributeProcessorList) {
-            processor.clean();
-        }
-        if (havingConditionExecutor != null) {
-            havingConditionExecutor.clean();
-        }
-        if (groupByKeyGenerator != null) {
-            groupByKeyGenerator.clean();
-        }
-        outputRateLimiter.clean();
-    }
-
     public List<AttributeProcessor> getAttributeProcessorList() {
         return attributeProcessorList;
     }
@@ -405,27 +386,6 @@ public void setHavingConditionExecutor(ConditionExpressionExecutor havingConditi
         this.containsAggregator = this.containsAggregator || containsAggregator;
     }
 
-    public QuerySelector clone(String key) {
-        QuerySelector clonedQuerySelector = new QuerySelector(id + key, selector, currentOn, expiredOn,
-                siddhiQueryContext);
-        List<AttributeProcessor> clonedAttributeProcessorList = new ArrayList<AttributeProcessor>();
-        for (AttributeProcessor attributeProcessor : attributeProcessorList) {
-            clonedAttributeProcessorList.add(attributeProcessor.cloneProcessor(key));
-        }
-        clonedQuerySelector.attributeProcessorList = clonedAttributeProcessorList;
-        clonedQuerySelector.isGroupBy = isGroupBy;
-        clonedQuerySelector.containsAggregator = containsAggregator;
-        clonedQuerySelector.groupByKeyGenerator = groupByKeyGenerator;
-        clonedQuerySelector.havingConditionExecutor = havingConditionExecutor;
-        clonedQuerySelector.eventPopulator = eventPopulator;
-        clonedQuerySelector.batchingEnabled = batchingEnabled;
-        clonedQuerySelector.isOrderBy = isOrderBy;
-        clonedQuerySelector.orderByEventComparator = orderByEventComparator;
-        clonedQuerySelector.limit = limit;
-        clonedQuerySelector.offset = offset;
-        return clonedQuerySelector;
-    }
-
     public void setBatchingEnabled(boolean batchingEnabled) {
         this.batchingEnabled = batchingEnabled;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AndAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AndAttributeAggregatorExecutor.java
similarity index 59%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AndAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AndAttributeAggregatorExecutor.java
index f41a1b6f00..8abd5d7eb7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AndAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AndAttributeAggregatorExecutor.java
@@ -27,13 +27,15 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate sum based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate sum based on an event attribute.
  */
 @Extension(
         name = "and",
@@ -57,11 +59,11 @@
                 )
         }
 )
-public class AndAttributeAggregator extends AttributeAggregator {
+public class AndAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<AndAttributeAggregatorExecutor.AggregatorState> {
 
     private static Attribute.Type type = Attribute.Type.BOOL;
-    private int trueEventsCount = 0;
-    private int falseEventsCount = 0;
+
 
     /**
      * The initialization method for FunctionExecutor
@@ -69,18 +71,19 @@ public class AndAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link AndAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link AndAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           current siddhi query context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
+                                boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("And aggregator has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length
                     + " parameters provided");
         }
+        return () -> new AggregatorState();
     }
 
     public Attribute.Type getReturnType() {
@@ -88,76 +91,82 @@ public Attribute.Type getReturnType() {
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, AggregatorState state) {
         if ((boolean) data) {
-            trueEventsCount++;
+            state.trueEventsCount++;
         } else {
-            falseEventsCount++;
+            state.falseEventsCount++;
         }
-        return computeLogicalOperation();
+        return computeLogicalOperation(state);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, AggregatorState state) {
         for (Object object : data) {
             if ((boolean) object) {
-                trueEventsCount++;
+                state.trueEventsCount++;
             } else {
-                falseEventsCount++;
+                state.falseEventsCount++;
             }
         }
-        return computeLogicalOperation();
+        return computeLogicalOperation(state);
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, AggregatorState state) {
         if ((boolean) data) {
-            trueEventsCount--;
+            state.trueEventsCount--;
         } else {
-            falseEventsCount--;
+            state.falseEventsCount--;
         }
-        return computeLogicalOperation();
+        return computeLogicalOperation(state);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, AggregatorState state) {
         for (Object object : data) {
             if ((boolean) object) {
-                trueEventsCount--;
+                state.trueEventsCount--;
             } else {
-                falseEventsCount--;
+                state.falseEventsCount--;
             }
         }
-        return computeLogicalOperation();
+        return computeLogicalOperation(state);
     }
 
-    private boolean computeLogicalOperation() {
-        return trueEventsCount > 0 && falseEventsCount == 0;
+    private boolean computeLogicalOperation(AggregatorState state) {
+        return state.trueEventsCount > 0 && state.falseEventsCount == 0;
     }
 
     @Override
-    public Object reset() {
-        trueEventsCount = 0;
-        falseEventsCount = 0;
+    public Object reset(AggregatorState state) {
+        state.trueEventsCount = 0;
+        state.falseEventsCount = 0;
         return false;
     }
 
-    @Override
-    public boolean canDestroy() {
-        return trueEventsCount == 0 && falseEventsCount == 0;
-    }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("trueEventsCount", trueEventsCount);
-        state.put("falseEventsCount", falseEventsCount);
-        return state;
-    }
+    class AggregatorState extends State {
+        private int trueEventsCount = 0;
+        private int falseEventsCount = 0;
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        trueEventsCount = (int) state.get("trueEventsCount");
-        falseEventsCount = (int) state.get("falseEventsCount");
+        @Override
+        public boolean canDestroy() {
+            return trueEventsCount == 0 && falseEventsCount == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("trueEventsCount", trueEventsCount);
+            state.put("falseEventsCount", falseEventsCount);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            trueEventsCount = (int) state.get("trueEventsCount");
+            falseEventsCount = (int) state.get("falseEventsCount");
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregator.java
deleted file mode 100644
index 5559c7dbe7..0000000000
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregator.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.core.query.selector.attribute.aggregator;
-
-import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.ComplexEvent;
-import io.siddhi.core.exception.SiddhiAppCreationException;
-import io.siddhi.core.exception.SiddhiAppRuntimeException;
-import io.siddhi.core.executor.ExpressionExecutor;
-import io.siddhi.core.query.processor.ProcessingMode;
-import io.siddhi.core.util.config.ConfigReader;
-import io.siddhi.query.api.definition.Attribute;
-
-import java.util.Map;
-
-/**
- * Abstract parent class for attribute aggregators. Attribute aggregators are used to perform aggregate operations
- * such as count, average, etc.
- */
-public abstract class AttributeAggregator {
-
-    protected ExpressionExecutor[] attributeExpressionExecutors;
-    private int attributeSize;
-    private ProcessingMode processingMode;
-    private boolean outputExpectsExpiredEvents;
-    private SiddhiQueryContext siddhiQueryContext;
-    private ConfigReader configReader;
-
-    public void initAggregator(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                               boolean outputExpectsExpiredEvents,
-                               ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
-        this.processingMode = processingMode;
-        this.outputExpectsExpiredEvents = outputExpectsExpiredEvents;
-        this.siddhiQueryContext = siddhiQueryContext;
-        this.configReader = configReader;
-        try {
-            this.attributeExpressionExecutors = attributeExpressionExecutors;
-            this.attributeSize = attributeExpressionExecutors.length;
-            init(attributeExpressionExecutors, processingMode, outputExpectsExpiredEvents,
-                    configReader, siddhiQueryContext);
-        } catch (Throwable t) {
-            throw new SiddhiAppCreationException(t);
-        }
-    }
-
-    public AttributeAggregator cloneAggregator(String key) {
-        try {
-            AttributeAggregator attributeAggregator = this.getClass().newInstance();
-            ExpressionExecutor[] innerExpressionExecutors = new ExpressionExecutor[attributeSize];
-            for (int i = 0; i < attributeSize; i++) {
-                innerExpressionExecutors[i] = attributeExpressionExecutors[i].cloneExecutor(key);
-            }
-            attributeAggregator.initAggregator(innerExpressionExecutors, processingMode, outputExpectsExpiredEvents,
-                    configReader, siddhiQueryContext);
-            return attributeAggregator;
-        } catch (Exception e) {
-            throw new SiddhiAppRuntimeException("Exception in cloning " + this.getClass().getCanonicalName(), e);
-        }
-    }
-
-    public synchronized Object process(ComplexEvent event) {
-        if (attributeSize > 1) {
-            Object[] data = new Object[attributeSize];
-            for (int i = 0; i < attributeSize; i++) {
-                data[i] = attributeExpressionExecutors[i].execute(event);
-            }
-            switch (event.getType()) {
-                case CURRENT:
-                    return processAdd(data);
-                case EXPIRED:
-                    return processRemove(data);
-                case RESET:
-                    return reset();
-            }
-        } else if (attributeSize == 1) {
-            switch (event.getType()) {
-                case CURRENT:
-                    return processAdd(attributeExpressionExecutors[0].execute(event));
-                case EXPIRED:
-                    return processRemove(attributeExpressionExecutors[0].execute(event));
-                case RESET:
-                    return reset();
-            }
-        } else {
-            switch (event.getType()) {
-                case CURRENT:
-                    return processAdd(null);
-                case EXPIRED:
-                    return processRemove(null);
-                case RESET:
-                    return reset();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * The initialization method for FunctionExecutor
-     *
-     * @param attributeExpressionExecutors are the executors of each attributes in the function
-     * @param processingMode               query processing mode
-     * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link AttributeAggregator} extensions configuration reader.
-     * @param siddhiQueryContext           Siddhi query runtime context
-     */
-    protected abstract void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                                 boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                                 SiddhiQueryContext siddhiQueryContext);
-
-    public abstract Attribute.Type getReturnType();
-
-    public abstract Object processAdd(Object data);
-
-    public abstract Object processAdd(Object[] data);
-
-    public abstract Object processRemove(Object data);
-
-    public abstract Object processRemove(Object[] data);
-
-    public abstract boolean canDestroy();
-
-    public abstract Object reset();
-
-    public abstract Map<String, Object> currentState();
-
-    public abstract void restoreState(Map<String, Object> state);
-
-    public void clean() {
-        for (ExpressionExecutor expressionExecutor : attributeExpressionExecutors) {
-            expressionExecutor.clean();
-        }
-    }
-}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
new file mode 100644
index 0000000000..72d2e7afff
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package io.siddhi.core.query.selector.attribute.aggregator;
+
+import io.siddhi.core.config.SiddhiQueryContext;
+import io.siddhi.core.event.ComplexEvent;
+import io.siddhi.core.exception.SiddhiAppCreationException;
+import io.siddhi.core.executor.ExpressionExecutor;
+import io.siddhi.core.query.processor.ProcessingMode;
+import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
+
+import java.util.Map;
+
+/**
+ * Abstract parent class for attribute aggregators. Attribute aggregators are used to perform aggregate operations
+ * such as count, average, etc.
+ *
+ * @param <S> current state for the Attribute Executor
+ */
+public abstract class AttributeAggregatorExecutor<S extends State> implements ExpressionExecutor {
+
+    protected ExpressionExecutor[] attributeExpressionExecutors;
+    private int attributeSize;
+    private StateHolder<S> stateHolder;
+
+    public void initAggregator(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
+                               boolean outputExpectsExpiredEvents,
+                               ConfigReader configReader, boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
+        try {
+            this.attributeExpressionExecutors = attributeExpressionExecutors;
+            this.attributeSize = attributeExpressionExecutors.length;
+            StateFactory<S> stateFactory = init(attributeExpressionExecutors, processingMode,
+                    outputExpectsExpiredEvents, configReader, siddhiQueryContext);
+            stateHolder = siddhiQueryContext.generateStateHolder(this.getClass().getName(), groupBy, stateFactory);
+        } catch (Throwable t) {
+            throw new SiddhiAppCreationException(t);
+        }
+    }
+
+    public synchronized Object execute(ComplexEvent event) {
+        if (attributeSize > 1) {
+            return processAttributeArray(event);
+        } else if (attributeSize == 1) {
+            return processAttribute(event);
+        } else {
+            return processNoAttribute(event);
+        }
+    }
+
+    private Object processAttributeArray(ComplexEvent event) {
+        Object[] data = new Object[attributeSize];
+        for (int i = 0; i < attributeSize; i++) {
+            data[i] = attributeExpressionExecutors[i].execute(event);
+        }
+        switch (event.getType()) {
+            case CURRENT:
+                return processAdd(data);
+            case EXPIRED:
+                return processRemove(data);
+            case RESET:
+                return processReset();
+        }
+        return null;
+    }
+
+    private Object processAttribute(ComplexEvent event) {
+        switch (event.getType()) {
+            case CURRENT:
+                return processAdd(attributeExpressionExecutors[0].execute(event));
+            case EXPIRED:
+                return processRemove(attributeExpressionExecutors[0].execute(event));
+            case RESET:
+                return processReset();
+        }
+        return null;
+    }
+
+    private Object processNoAttribute(ComplexEvent event) {
+        switch (event.getType()) {
+            case CURRENT:
+                return processAdd(null);
+            case EXPIRED:
+                return processRemove(null);
+            case RESET:
+                return processReset();
+        }
+        return null;
+    }
+
+    private Object processAdd(Object data) {
+        S state;
+        state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                return processAdd(data, state);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    private Object processRemove(Object data) {
+        S state;
+        state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                return processRemove(data, state);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    private Object processAdd(Object[] data) {
+        S state;
+        state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                return processAdd(data, state);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    private Object processRemove(Object[] data) {
+        S state;
+        state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                return processRemove(data, state);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    private Object processReset() {
+        Object returnValue = null;
+        synchronized (stateHolder) {
+            Map<String, S> states = stateHolder.getAllStates();
+            try {
+                for (S aState : states.values()) {
+                    returnValue = reset(aState);
+                }
+            } finally {
+                stateHolder.returnStates(states);
+            }
+        }
+        return returnValue;
+    }
+
+    /**
+     * The initialization method for FunctionExecutor
+     *
+     * @param attributeExpressionExecutors are the executors of each attributes in the function
+     * @param processingMode               query processing mode
+     * @param outputExpectsExpiredEvents   is expired events sent as output
+     * @param configReader                 this hold the {@link AttributeAggregatorExecutor} extensions
+     *                                     configuration reader.
+     * @param siddhiQueryContext           Siddhi query runtime context
+     */
+    protected abstract StateFactory<S> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                            ProcessingMode processingMode,
+                                            boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                            SiddhiQueryContext siddhiQueryContext);
+
+    public abstract Object processAdd(Object data, S state);
+
+    public abstract Object processAdd(Object[] data, S state);
+
+    public abstract Object processRemove(Object data, S state);
+
+    public abstract Object processRemove(Object[] data, S state);
+
+    public abstract Object reset(S state);
+
+
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AvgAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AvgAttributeAggregatorExecutor.java
similarity index 70%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AvgAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AvgAttributeAggregatorExecutor.java
index 55bc20a663..777498a48c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AvgAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AvgAttributeAggregatorExecutor.java
@@ -27,6 +27,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.Arrays;
@@ -34,7 +36,7 @@
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate average based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate average based on an event attribute.
  */
 @Extension(
         name = "avg",
@@ -54,9 +56,10 @@
                         "arrival and expiry."
         )
 )
-public class AvgAttributeAggregator extends AttributeAggregator {
+public class AvgAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<AvgAttributeAggregatorExecutor.AvgAttributeState> {
 
-    private AvgAttributeAggregator avgOutputAttributeAggregator;
+    private Attribute.Type returnType;
 
     /**
      * The initialization method for FunctionExecutor
@@ -64,102 +67,79 @@ public class AvgAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link AvgAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link AvgAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<AvgAttributeState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                   ProcessingMode processingMode,
+                                                   boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                   SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("Avg aggregator has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length + " parameters provided");
         }
+        returnType = Attribute.Type.DOUBLE;
         Attribute.Type type = attributeExpressionExecutors[0].getReturnType();
-        switch (type) {
-            case FLOAT:
-                avgOutputAttributeAggregator = new AvgAttributeAggregatorFloat();
-                break;
-            case INT:
-                avgOutputAttributeAggregator = new AvgAttributeAggregatorInt();
-                break;
-            case LONG:
-                avgOutputAttributeAggregator = new AvgAttributeAggregatorLong();
-                break;
-            case DOUBLE:
-                avgOutputAttributeAggregator = new AvgAttributeAggregatorDouble();
-                break;
-            default:
-                throw new OperationNotSupportedException("Avg not supported for " + type);
-        }
+        return () -> {
+            switch (type) {
+                case FLOAT:
+                    return new AvgAttributeAggregatorStateFloat();
+                case INT:
+                    return new AvgAttributeAggregatorStateInt();
+                case LONG:
+                    return new AvgAttributeAggregatorStateLong();
+                case DOUBLE:
+                    return new AvgAttributeAggregatorStateDouble();
+                default:
+                    throw new OperationNotSupportedException("Avg not supported for " + returnType);
+            }
+        };
+
     }
 
     public Attribute.Type getReturnType() {
-        return avgOutputAttributeAggregator.getReturnType();
+        return returnType;
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, AvgAttributeState state) {
         if (data == null) {
-            return avgOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return avgOutputAttributeAggregator.processAdd(data);
+        return state.processAdd(data);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, AvgAttributeState state) {
         // will not occur
         return new IllegalStateException("Avg cannot process data array, but found " + Arrays.deepToString(data));
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, AvgAttributeState state) {
         if (data == null) {
-            return avgOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return avgOutputAttributeAggregator.processRemove(data);
+        return state.processRemove(data);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, AvgAttributeState state) {
         // will not occur
         return new IllegalStateException("Avg cannot process data array, but found " + Arrays.deepToString(data));
     }
 
-    protected Object currentValue() {
-        return null;
-    }
-
-    @Override
-    public boolean canDestroy() {
-        return avgOutputAttributeAggregator.canDestroy();
-    }
-
-    @Override
-    public Object reset() {
-        return avgOutputAttributeAggregator.reset();
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return avgOutputAttributeAggregator.currentState();
-    }
-
     @Override
-    public void restoreState(Map<String, Object> state) {
-        avgOutputAttributeAggregator.restoreState(state);
+    public Object reset(AvgAttributeState state) {
+        return state.reset();
     }
 
-    class AvgAttributeAggregatorDouble extends AvgAttributeAggregator {
+    class AvgAttributeAggregatorStateDouble extends AvgAttributeState {
 
-        private final Attribute.Type type = Attribute.Type.DOUBLE;
         private double value = 0.0;
         private long count = 0;
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public Object processAdd(Object data) {
             count++;
@@ -193,7 +173,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("Value", value);
             state.put("Count", count);
@@ -201,7 +181,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             value = (double) state.get("Value");
             count = (long) state.get("Count");
         }
@@ -214,16 +194,11 @@ protected Object currentValue() {
         }
     }
 
-    class AvgAttributeAggregatorFloat extends AvgAttributeAggregator {
+    class AvgAttributeAggregatorStateFloat extends AvgAttributeState {
 
-        private final Attribute.Type type = Attribute.Type.DOUBLE;
         private double value = 0.0;
         private long count = 0;
 
-        public Attribute.Type getReturnType() {
-            return this.type;
-        }
-
         @Override
         public Object processAdd(Object data) {
             count++;
@@ -257,7 +232,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("Value", value);
             state.put("Count", count);
@@ -265,7 +240,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             value = (double) state.get("Value");
             count = (long) state.get("Count");
         }
@@ -278,16 +253,11 @@ protected Object currentValue() {
         }
     }
 
-    class AvgAttributeAggregatorInt extends AvgAttributeAggregator {
+    class AvgAttributeAggregatorStateInt extends AvgAttributeState {
 
-        private final Attribute.Type type = Attribute.Type.DOUBLE;
         private double value = 0.0;
         private long count = 0;
 
-        public Attribute.Type getReturnType() {
-            return this.type;
-        }
-
         @Override
         public Object processAdd(Object data) {
             count++;
@@ -321,7 +291,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("Value", value);
             state.put("Count", count);
@@ -329,7 +299,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             value = (double) state.get("Value");
             count = (long) state.get("Count");
         }
@@ -340,19 +310,13 @@ protected Object currentValue() {
             }
             return value / count;
         }
-
     }
 
-    class AvgAttributeAggregatorLong extends AvgAttributeAggregator {
+    class AvgAttributeAggregatorStateLong extends AvgAttributeState {
 
-        private final Attribute.Type type = Attribute.Type.DOUBLE;
         private double value = 0.0;
         private long count = 0;
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public Object processAdd(Object data) {
             count++;
@@ -386,7 +350,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("Value", value);
             state.put("Count", count);
@@ -394,7 +358,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             value = (double) state.get("Value");
             count = (long) state.get("Count");
         }
@@ -405,7 +369,16 @@ protected Object currentValue() {
             }
             return value / count;
         }
+    }
+
+    abstract class AvgAttributeState extends State {
+        public abstract Object processAdd(Object data);
+
+        public abstract Object processRemove(Object obj);
+
+        public abstract Object reset();
 
+        protected abstract Object currentValue();
     }
 
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregatorExecutor.java
similarity index 57%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregatorExecutor.java
index 390ae68c53..cd94c05f8e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregatorExecutor.java
@@ -25,13 +25,15 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate count.
+ * {@link AttributeAggregatorExecutor} to calculate count.
  */
 @Extension(
         name = "count",
@@ -48,10 +50,10 @@
                 description = "This will return the count of all the events for time batch in 10 seconds."
         )
 )
-public class CountAttributeAggregator extends AttributeAggregator {
+public class CountAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<CountAttributeAggregatorExecutor.AggregatorState> {
 
     private static Attribute.Type type = Attribute.Type.LONG;
-    private long count = 0L;
 
     /**
      * The initialization method for FunctionExecutor
@@ -59,13 +61,16 @@ public class CountAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link CountAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link CountAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<AggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                 ProcessingMode processingMode,
+                                                 boolean outputExpectsExpiredEvents,
+                                                 ConfigReader configReader,
+                                                 SiddhiQueryContext siddhiQueryContext) {
+        return () -> new AggregatorState();
 
     }
 
@@ -74,49 +79,54 @@ public Attribute.Type getReturnType() {
     }
 
     @Override
-    public Object processAdd(Object data) {
-        count++;
-        return count;
+    public Object processAdd(Object data, AggregatorState state) {
+        state.count++;
+        return state.count;
     }
 
     @Override
-    public Object processAdd(Object[] data) {
-        count++;
-        return count;
+    public Object processAdd(Object[] data, AggregatorState state) {
+        state.count++;
+        return state.count;
     }
 
     @Override
-    public Object processRemove(Object data) {
-        count--;
-        return count;
+    public Object processRemove(Object data, AggregatorState state) {
+        state.count--;
+        return state.count;
     }
 
     @Override
-    public Object processRemove(Object[] data) {
-        count--;
-        return count;
+    public Object processRemove(Object[] data, AggregatorState state) {
+        state.count--;
+        return state.count;
     }
 
     @Override
-    public Object reset() {
-        count = 0L;
-        return count;
+    public Object reset(AggregatorState state) {
+        state.count = 0L;
+        return state.count;
     }
 
-    @Override
-    public boolean canDestroy() {
-        return count == 0;
-    }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("Count", count);
-        return state;
-    }
+    class AggregatorState extends State {
+        private long count = 0L;
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        count = (long) state.get("Count");
+        @Override
+        public boolean canDestroy() {
+            return count == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Count", count);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            count = (long) state.get("Count");
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutor.java
similarity index 63%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutor.java
index 7fae74d654..d8d10f6d56 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutor.java
@@ -28,6 +28,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.Arrays;
@@ -35,7 +37,7 @@
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate distinct count based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate distinct count based on an event attribute.
  */
 @Extension(
         name = "distinctCount",
@@ -64,8 +66,8 @@
                         " The three distinct occurences identified are 'WEB_PAGE_1', 'WEB_PAGE_2', and 'WEB_PAGE_3'."
         )
 )
-public class DistinctCountAttributeAggregator extends AttributeAggregator {
-    private Map<Object, Long> distinctValues = new HashMap<Object, Long>();
+public class DistinctCountAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<DistinctCountAttributeAggregatorExecutor.AggregatorState> {
 
     /**
      * The initialization method for FunctionExecutor
@@ -73,18 +75,21 @@ public class DistinctCountAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link DistinctCountAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link DistinctCountAttributeAggregatorExecutor}
+     *                                     configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<AggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                 ProcessingMode processingMode,
+                                                 boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                 SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("Distinct count aggregator has to have exactly 1 parameter, " +
                     "currently " + attributeExpressionExecutors.length +
                     " parameters provided");
         }
+        return () -> new AggregatorState();
     }
 
     public Attribute.Type getReturnType() {
@@ -92,64 +97,70 @@ public Attribute.Type getReturnType() {
     }
 
     @Override
-    public Object processAdd(Object data) {
-        Long preVal = distinctValues.get(data);
+    public Object processAdd(Object data, AggregatorState state) {
+        Long preVal = state.distinctValues.get(data);
         if (preVal != null) {
-            distinctValues.put(data, ++preVal);
+            state.distinctValues.put(data, ++preVal);
         } else {
-            distinctValues.put(data, 1L);
+            state.distinctValues.put(data, 1L);
         }
-        return getDistinctCount();
+        return state.getDistinctCount();
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, AggregatorState state) {
         return new IllegalStateException(
                 "Distinct count aggregator cannot process data array, but found " + Arrays.deepToString(data));
     }
 
     @Override
-    public Object processRemove(Object data) {
-        Long preVal = distinctValues.get(data);
+    public Object processRemove(Object data, AggregatorState state) {
+        Long preVal = state.distinctValues.get(data);
         preVal--;
         if (preVal > 0) {
-            distinctValues.put(data, preVal);
+            state.distinctValues.put(data, preVal);
         } else {
-            distinctValues.remove(data);
+            state.distinctValues.remove(data);
         }
-        return getDistinctCount();
+        return state.getDistinctCount();
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, AggregatorState state) {
         return new IllegalStateException(
                 "Distinct count aggregator cannot process data array, but found " + Arrays.deepToString(data));
     }
 
     @Override
-    public Object reset() {
-        distinctValues.clear();
-        return getDistinctCount();
+    public Object reset(AggregatorState state) {
+        state.distinctValues.clear();
+        return state.getDistinctCount();
     }
 
-    @Override
-    public boolean canDestroy() {
-        return distinctValues.size() == 0;
-    }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("DistinctValues", distinctValues);
-        return state;
-    }
+    class AggregatorState extends State {
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        distinctValues = (Map<Object, Long>) state.get("DistinctValues");
-    }
+        private Map<Object, Long> distinctValues = new HashMap<Object, Long>();
 
-    private long getDistinctCount() {
-        return distinctValues.size();
+        @Override
+        public boolean canDestroy() {
+            return distinctValues.size() == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("DistinctValues", distinctValues);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            distinctValues = (Map<Object, Long>) state.get("DistinctValues");
+        }
+
+        protected long getDistinctCount() {
+            return distinctValues.size();
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
similarity index 75%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
index 0d0e2a6382..fba12258b9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
@@ -27,6 +27,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.Arrays;
@@ -37,7 +39,7 @@
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate max value based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate max value based on an event attribute.
  */
 @Extension(
         name = "max",
@@ -59,9 +61,10 @@
                         "arrival and expiry."
         )
 )
-public class MaxAttributeAggregator extends AttributeAggregator {
+public class MaxAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<MaxAttributeAggregatorExecutor.MaxAggregatorState> {
 
-    private MaxAttributeAggregator maxOutputAttributeAggregator;
+    private Attribute.Type returnType;
 
     /**
      * The initialization method for FunctionExecutor
@@ -69,13 +72,15 @@ public class MaxAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link MaxAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link MaxAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<MaxAggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                    ProcessingMode processingMode,
+                                                    boolean outputExpectsExpiredEvents,
+                                                    ConfigReader configReader,
+                                                    SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("Max aggregator has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length + " parameters provided");
@@ -84,97 +89,75 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, Processin
         if (processingMode == ProcessingMode.SLIDE || outputExpectsExpiredEvents) {
             trackFutureStates = true;
         }
-        Attribute.Type type = attributeExpressionExecutors[0].getReturnType();
-        switch (type) {
-            case FLOAT:
-                maxOutputAttributeAggregator = new MaxAttributeAggregatorFloat(trackFutureStates);
-                break;
-            case INT:
-                maxOutputAttributeAggregator = new MaxAttributeAggregatorInt(trackFutureStates);
-                break;
-            case LONG:
-                maxOutputAttributeAggregator = new MaxAttributeAggregatorLong(trackFutureStates);
-                break;
-            case DOUBLE:
-                maxOutputAttributeAggregator = new MaxAttributeAggregatorDouble(trackFutureStates);
-                break;
-            default:
-                throw new OperationNotSupportedException("Max not supported for " + type);
-        }
+        returnType = attributeExpressionExecutors[0].getReturnType();
+        boolean finalTrackFutureStates = trackFutureStates;
+        return new StateFactory<MaxAggregatorState>() {
+            @Override
+            public MaxAggregatorState createNewState() {
+                switch (returnType) {
+                    case FLOAT:
+                        return new MaxAttributeAggregatorStateFloat(finalTrackFutureStates);
+                    case INT:
+                        return new MaxAttributeAggregatorStateInt(finalTrackFutureStates);
+                    case LONG:
+                        return new MaxAttributeAggregatorStateLong(finalTrackFutureStates);
+                    case DOUBLE:
+                        return new MaxAttributeAggregatorStateDouble(finalTrackFutureStates);
+                    default:
+                        throw new OperationNotSupportedException("Max not supported for " + returnType);
+                }
+            }
+        };
     }
 
     public Attribute.Type getReturnType() {
-        return maxOutputAttributeAggregator.getReturnType();
+        return returnType;
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, MaxAggregatorState state) {
         if (data == null) {
-            return maxOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return maxOutputAttributeAggregator.processAdd(data);
-    }
-
-    protected Object currentValue() {
-        return null;
+        return state.processAdd(data);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, MaxAggregatorState state) {
         // will not occur
         return new IllegalStateException("Max cannot process data array, but found " + Arrays.deepToString(data));
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, MaxAggregatorState state) {
         if (data == null) {
-            return maxOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return maxOutputAttributeAggregator.processRemove(data);
+        return state.processRemove(data);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, MaxAggregatorState state) {
         // will not occur
         return new IllegalStateException("Max cannot process data array, but found " + Arrays.deepToString(data));
     }
 
     @Override
-    public boolean canDestroy() {
-        return maxOutputAttributeAggregator.canDestroy();
-    }
-
-    @Override
-    public Object reset() {
-        return maxOutputAttributeAggregator.reset();
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return maxOutputAttributeAggregator.currentState();
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        maxOutputAttributeAggregator.restoreState(state);
+    public Object reset(MaxAggregatorState state) {
+        return state.reset();
     }
 
-    class MaxAttributeAggregatorDouble extends MaxAttributeAggregator {
+    class MaxAttributeAggregatorStateDouble extends MaxAggregatorState {
 
-        private final Attribute.Type type = Attribute.Type.DOUBLE;
         private Deque<Double> maxDeque = null;
         private volatile Double maxValue = null;
 
-        public MaxAttributeAggregatorDouble(boolean trackFutureStates) {
+        public MaxAttributeAggregatorStateDouble(boolean trackFutureStates) {
             if (trackFutureStates) {
                 maxDeque = new LinkedList<>();
             }
         }
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public synchronized Object processAdd(Object data) {
             Double value = (Double) data;
@@ -222,7 +205,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             synchronized (this) {
                 state.put("MaxValue", maxValue);
@@ -232,7 +215,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public synchronized void restoreState(Map<String, Object> state) {
+        public synchronized void restore(Map<String, Object> state) {
             maxValue = (Double) state.get("MaxValue");
             maxDeque = (Deque<Double>) state.get("MaxDeque");
         }
@@ -242,22 +225,17 @@ protected Object currentValue() {
         }
     }
 
-    class MaxAttributeAggregatorFloat extends MaxAttributeAggregator {
+    class MaxAttributeAggregatorStateFloat extends MaxAggregatorState {
 
-        private final Attribute.Type type = Attribute.Type.FLOAT;
         private Deque<Float> maxDeque = null;
         private volatile Float maxValue = null;
 
-        public MaxAttributeAggregatorFloat(boolean trackFutureStates) {
+        public MaxAttributeAggregatorStateFloat(boolean trackFutureStates) {
             if (trackFutureStates) {
                 maxDeque = new LinkedList<>();
             }
         }
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public synchronized Object processAdd(Object data) {
             Float value = (Float) data;
@@ -305,7 +283,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             synchronized (this) {
                 state.put("MaxValue", maxValue);
@@ -315,7 +293,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public synchronized void restoreState(Map<String, Object> state) {
+        public synchronized void restore(Map<String, Object> state) {
             maxValue = (Float) state.get("MaxValue");
             maxDeque = (Deque<Float>) state.get("MaxDeque");
         }
@@ -326,22 +304,17 @@ protected Object currentValue() {
 
     }
 
-    class MaxAttributeAggregatorInt extends MaxAttributeAggregator {
+    class MaxAttributeAggregatorStateInt extends MaxAggregatorState {
 
-        private final Attribute.Type type = Attribute.Type.INT;
         private Deque<Integer> maxDeque = null;
         private volatile Integer maxValue = null;
 
-        public MaxAttributeAggregatorInt(boolean trackFutureStates) {
+        public MaxAttributeAggregatorStateInt(boolean trackFutureStates) {
             if (trackFutureStates) {
                 maxDeque = new LinkedList<>();
             }
         }
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public synchronized Object processAdd(Object data) {
             Integer value = (Integer) data;
@@ -389,7 +362,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             synchronized (this) {
                 state.put("MaxValue", maxValue);
@@ -399,7 +372,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public synchronized void restoreState(Map<String, Object> state) {
+        public synchronized void restore(Map<String, Object> state) {
             maxValue = (Integer) state.get("MaxValue");
             maxDeque = (Deque<Integer>) state.get("MaxDeque");
         }
@@ -410,22 +383,17 @@ protected Object currentValue() {
 
     }
 
-    class MaxAttributeAggregatorLong extends MaxAttributeAggregator {
+    class MaxAttributeAggregatorStateLong extends MaxAggregatorState {
 
-        private final Attribute.Type type = Attribute.Type.LONG;
         private Deque<Long> maxDeque = null;
         private volatile Long maxValue = null;
 
-        public MaxAttributeAggregatorLong(boolean trackFutureStates) {
+        public MaxAttributeAggregatorStateLong(boolean trackFutureStates) {
             if (trackFutureStates) {
                 maxDeque = new LinkedList<>();
             }
         }
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public synchronized Object processAdd(Object data) {
             Long value = (Long) data;
@@ -473,7 +441,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             synchronized (this) {
                 state.put("MaxValue", maxValue);
@@ -483,7 +451,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public synchronized void restoreState(Map<String, Object> state) {
+        public synchronized void restore(Map<String, Object> state) {
             maxValue = (Long) state.get("MaxValue");
             maxDeque = (Deque<Long>) state.get("MaxDeque");
         }
@@ -494,4 +462,14 @@ protected Object currentValue() {
 
     }
 
+    abstract class MaxAggregatorState extends State {
+        public abstract Object processAdd(Object data);
+
+        public abstract Object processRemove(Object data);
+
+        public abstract Object reset();
+
+        protected abstract Object currentValue();
+    }
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregatorExecutor.java
similarity index 68%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregatorExecutor.java
index a8c80b716d..bc5d1f2526 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregatorExecutor.java
@@ -28,6 +28,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.Arrays;
@@ -35,7 +37,7 @@
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate max value for life time based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate max value for life time based on an event attribute.
  */
 @Extension(
         name = "maxForever",
@@ -58,9 +60,10 @@
                         " the lifetime of the query."
         )
 )
-public class MaxForeverAttributeAggregator extends AttributeAggregator {
+public class MaxForeverAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<MaxForeverAttributeAggregatorExecutor.MaxAggregatorState> {
 
-    private MaxForeverAttributeAggregator maxForeverAttributeAggregator;
+    private Attribute.Type returnType;
 
     /**
      * The initialization method for FunctionExecutor
@@ -68,104 +71,85 @@ public class MaxForeverAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link MaxForeverAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link MaxForeverAttributeAggregatorExecutor}
+     *                                     configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<MaxAggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                    ProcessingMode processingMode,
+                                                    boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                    SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("MaxForever aggregator has to have exactly 1 parameter, " +
                     "currently " +
                     attributeExpressionExecutors.length + " parameters provided");
         }
-        Attribute.Type type = attributeExpressionExecutors[0].getReturnType();
-        switch (type) {
-            case FLOAT:
-                maxForeverAttributeAggregator = new MaxForeverAttributeAggregatorFloat();
-                break;
-            case INT:
-                maxForeverAttributeAggregator = new MaxForeverAttributeAggregatorInt();
-                break;
-            case LONG:
-                maxForeverAttributeAggregator = new MaxForeverAttributeAggregatorLong();
-                break;
-            case DOUBLE:
-                maxForeverAttributeAggregator = new MaxForeverAttributeAggregatorDouble();
-                break;
-            default:
-                throw new OperationNotSupportedException("MaxForever not supported for " + type);
-        }
+        returnType = attributeExpressionExecutors[0].getReturnType();
+        return new StateFactory<MaxAggregatorState>() {
+            @Override
+            public MaxAggregatorState createNewState() {
+                switch (returnType) {
+                    case FLOAT:
+                        return new MaxForeverAttributeAggregatorStateFloat();
+                    case INT:
+                        return new MaxForeverAttributeAggregatorStateInt();
+                    case LONG:
+                        return new MaxForeverAttributeAggregatorStateLong();
+                    case DOUBLE:
+                        return new MaxForeverAttributeAggregatorStateDouble();
+                    default:
+                        throw new OperationNotSupportedException("MaxForever not supported for " + returnType);
+                }
+            }
+        };
+
     }
 
     public Attribute.Type getReturnType() {
-        return maxForeverAttributeAggregator.getReturnType();
+        return returnType;
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, MaxAggregatorState state) {
         if (data == null) {
-            return maxForeverAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return maxForeverAttributeAggregator.processAdd(data);
-    }
-
-    protected Object currentValue() {
-        return null;
+        return state.processAdd(data);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, MaxAggregatorState state) {
         // will not occur
         return new IllegalStateException("MaxForever cannot process data array, but found " +
                 Arrays.deepToString(data));
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, MaxAggregatorState state) {
         if (data == null) {
-            return maxForeverAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return maxForeverAttributeAggregator.processRemove(data);
+        return state.processRemove(data);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, MaxAggregatorState state) {
         // will not occur
         return new IllegalStateException("MaxForever cannot process data array, but found " +
                 Arrays.deepToString(data));
     }
 
-    @Override
-    public boolean canDestroy() {
-        return false;
-    }
 
     @Override
-    public Object reset() {
-        return maxForeverAttributeAggregator.reset();
+    public Object reset(MaxAggregatorState state) {
+        return state.reset();
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return maxForeverAttributeAggregator.currentState();
-    }
+    class MaxForeverAttributeAggregatorStateDouble extends MaxAggregatorState {
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        maxForeverAttributeAggregator.restoreState(state);
-    }
-
-    class MaxForeverAttributeAggregatorDouble extends MaxForeverAttributeAggregator {
-
-        private final Attribute.Type type = Attribute.Type.DOUBLE;
         private volatile Double maxValue = null;
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public synchronized Object processAdd(Object data) {
             Double value = (Double) data;
@@ -190,14 +174,19 @@ public Object reset() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public boolean canDestroy() {
+            return maxValue == null;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("MaxValue", maxValue);
             return state;
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             maxValue = (Double) state.get("MaxValue");
         }
 
@@ -207,15 +196,10 @@ protected Object currentValue() {
 
     }
 
-    class MaxForeverAttributeAggregatorFloat extends MaxForeverAttributeAggregator {
+    class MaxForeverAttributeAggregatorStateFloat extends MaxAggregatorState {
 
-        private final Attribute.Type type = Attribute.Type.FLOAT;
         private volatile Float maxValue = null;
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public synchronized Object processAdd(Object data) {
             Float value = (Float) data;
@@ -240,14 +224,19 @@ public Object reset() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public boolean canDestroy() {
+            return maxValue == null;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("MaxValue", maxValue);
             return state;
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             maxValue = (Float) state.get("MaxValue");
         }
 
@@ -257,15 +246,10 @@ protected Object currentValue() {
 
     }
 
-    class MaxForeverAttributeAggregatorInt extends MaxForeverAttributeAggregator {
+    class MaxForeverAttributeAggregatorStateInt extends MaxAggregatorState {
 
-        private final Attribute.Type type = Attribute.Type.INT;
         private volatile Integer maxValue = null;
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public synchronized Object processAdd(Object data) {
             Integer value = (Integer) data;
@@ -290,14 +274,19 @@ public Object reset() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public boolean canDestroy() {
+            return maxValue == null;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("MaxValue", maxValue);
             return state;
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             maxValue = (Integer) state.get("MaxValue");
         }
 
@@ -306,15 +295,10 @@ protected Object currentValue() {
         }
     }
 
-    class MaxForeverAttributeAggregatorLong extends MaxForeverAttributeAggregator {
+    class MaxForeverAttributeAggregatorStateLong extends MaxAggregatorState {
 
-        private final Attribute.Type type = Attribute.Type.LONG;
         private volatile Long maxValue = null;
 
-        public Attribute.Type getReturnType() {
-            return type;
-        }
-
         @Override
         public synchronized Object processAdd(Object data) {
             Long value = (Long) data;
@@ -339,14 +323,19 @@ public Object reset() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public boolean canDestroy() {
+            return maxValue == null;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("MaxValue", maxValue);
             return state;
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             maxValue = (Long) state.get("MaxValue");
         }
 
@@ -355,4 +344,14 @@ protected Object currentValue() {
         }
     }
 
+    abstract class MaxAggregatorState extends State {
+        public abstract Object processAdd(Object data);
+
+        public abstract Object processRemove(Object data);
+
+        public abstract Object reset();
+
+        protected abstract Object currentValue();
+    }
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
similarity index 77%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
index 00789913c7..02c3fc3235 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
@@ -27,6 +27,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.Arrays;
@@ -37,7 +39,7 @@
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate min value based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate min value based on an event attribute.
  */
 @Extension(
         name = "min",
@@ -59,9 +61,10 @@
                         "arrival and expiry."
         )
 )
-public class MinAttributeAggregator extends AttributeAggregator {
+public class MinAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<MinAttributeAggregatorExecutor.MinAggregatorState> {
 
-    private MinAttributeAggregator minOutputAttributeAggregator;
+    private Attribute.Type returnType;
 
     public void init(Attribute.Type type) {
     }
@@ -72,13 +75,14 @@ public void init(Attribute.Type type) {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link MinAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link MinAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<MinAggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                    ProcessingMode processingMode,
+                                                    boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                    SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("Min aggregator has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length + " parameters provided");
@@ -87,88 +91,72 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, Processin
         if (processingMode == ProcessingMode.SLIDE || outputExpectsExpiredEvents) {
             trackFutureStates = true;
         }
-        Attribute.Type type = attributeExpressionExecutors[0].getReturnType();
-        switch (type) {
-            case FLOAT:
-                minOutputAttributeAggregator = new MinAttributeAggregatorFloat(trackFutureStates);
-                break;
-            case INT:
-                minOutputAttributeAggregator = new MinAttributeAggregatorInt(trackFutureStates);
-                break;
-            case LONG:
-                minOutputAttributeAggregator = new MinAttributeAggregatorLong(trackFutureStates);
-                break;
-            case DOUBLE:
-                minOutputAttributeAggregator = new MinAttributeAggregatorDouble(trackFutureStates);
-                break;
-            default:
-                throw new OperationNotSupportedException("Min not supported for " + type);
-        }
+        returnType = attributeExpressionExecutors[0].getReturnType();
+        boolean finalTrackFutureStates = trackFutureStates;
+        return new StateFactory<MinAggregatorState>() {
+            @Override
+            public MinAggregatorState createNewState() {
+                switch (returnType) {
+                    case FLOAT:
+                        return new MinAttributeAggregatorStateFloat(finalTrackFutureStates);
+                    case INT:
+                        return new MinAttributeAggregatorStateInt(finalTrackFutureStates);
+                    case LONG:
+                        return new MinAttributeAggregatorStateLong(finalTrackFutureStates);
+                    case DOUBLE:
+                        return new MinAttributeAggregatorStateDouble(finalTrackFutureStates);
+                    default:
+                        throw new OperationNotSupportedException("Min not supported for " + returnType);
+                }
+            }
+        };
+
     }
 
     public Attribute.Type getReturnType() {
-        return minOutputAttributeAggregator.getReturnType();
+        return returnType;
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, MinAggregatorState state) {
         if (data == null) {
-            return minOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return minOutputAttributeAggregator.processAdd(data);
+        return state.processAdd(data);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, MinAggregatorState state) {
         // will not occur
         return new IllegalStateException("Min cannot process data array, but found " + Arrays.deepToString(data));
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, MinAggregatorState state) {
         if (data == null) {
-            return minOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return minOutputAttributeAggregator.processRemove(data);
+        return state.processRemove(data);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, MinAggregatorState state) {
         // will not occur
         return new IllegalStateException("Min cannot process data array, but found " + Arrays.deepToString(data));
     }
 
-    protected Object currentValue() {
-        return null;
-    }
-
-    @Override
-    public boolean canDestroy() {
-        return minOutputAttributeAggregator.canDestroy();
-    }
-
-    @Override
-    public Object reset() {
-        return minOutputAttributeAggregator.reset();
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return minOutputAttributeAggregator.currentState();
-    }
-
     @Override
-    public void restoreState(Map<String, Object> state) {
-        minOutputAttributeAggregator.restoreState(state);
+    public Object reset(MinAggregatorState state) {
+        return state.reset();
     }
 
-    class MinAttributeAggregatorDouble extends MinAttributeAggregator {
+    class MinAttributeAggregatorStateDouble extends MinAggregatorState {
 
         private final Attribute.Type type = Attribute.Type.DOUBLE;
         private Deque<Double> minDeque = null;
         private volatile Double minValue = null;
 
-        public MinAttributeAggregatorDouble(boolean trackFutureStates) {
+        public MinAttributeAggregatorStateDouble(boolean trackFutureStates) {
             if (trackFutureStates) {
                 minDeque = new LinkedList<>();
             }
@@ -225,7 +213,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             synchronized (this) {
                 state.put("MinValue", minValue);
@@ -235,7 +223,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public synchronized void restoreState(Map<String, Object> state) {
+        public synchronized void restore(Map<String, Object> state) {
             minValue = (Double) state.get("MinValue");
             minDeque = (Deque<Double>) state.get("MinDeque");
         }
@@ -246,13 +234,13 @@ protected Object currentValue() {
 
     }
 
-    class MinAttributeAggregatorFloat extends MinAttributeAggregator {
+    class MinAttributeAggregatorStateFloat extends MinAggregatorState {
 
         private final Attribute.Type type = Attribute.Type.FLOAT;
         private Deque<Float> minDeque = null;
         private volatile Float minValue = null;
 
-        public MinAttributeAggregatorFloat(boolean trackFutureStates) {
+        public MinAttributeAggregatorStateFloat(boolean trackFutureStates) {
             if (trackFutureStates) {
                 minDeque = new LinkedList<>();
             }
@@ -309,7 +297,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             synchronized (this) {
                 state.put("MinValue", minValue);
@@ -319,7 +307,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public synchronized void restoreState(Map<String, Object> state) {
+        public synchronized void restore(Map<String, Object> state) {
             minValue = (Float) state.get("MinValue");
             minDeque = (Deque<Float>) state.get("MinDeque");
         }
@@ -329,13 +317,13 @@ protected Object currentValue() {
         }
     }
 
-    class MinAttributeAggregatorInt extends MinAttributeAggregator {
+    class MinAttributeAggregatorStateInt extends MinAggregatorState {
 
         private final Attribute.Type type = Attribute.Type.INT;
         private Deque<Integer> minDeque = null;
         private volatile Integer minValue = null;
 
-        public MinAttributeAggregatorInt(boolean trackFutureStates) {
+        public MinAttributeAggregatorStateInt(boolean trackFutureStates) {
             if (trackFutureStates) {
                 minDeque = new LinkedList<>();
             }
@@ -393,7 +381,7 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             synchronized (this) {
                 state.put("MinValue", minValue);
@@ -403,7 +391,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public synchronized void restoreState(Map<String, Object> state) {
+        public synchronized void restore(Map<String, Object> state) {
             minValue = (Integer) state.get("MinValue");
             minDeque = (Deque<Integer>) state.get("MinDeque");
         }
@@ -413,13 +401,13 @@ protected Object currentValue() {
         }
     }
 
-    class MinAttributeAggregatorLong extends MinAttributeAggregator {
+    class MinAttributeAggregatorStateLong extends MinAggregatorState {
 
         private final Attribute.Type type = Attribute.Type.LONG;
         private Deque<Long> minDeque = null;
         private volatile Long minValue = null;
 
-        public MinAttributeAggregatorLong(boolean trackFutureStates) {
+        public MinAttributeAggregatorStateLong(boolean trackFutureStates) {
             if (trackFutureStates) {
                 minDeque = new LinkedList<>();
             }
@@ -476,7 +464,7 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             synchronized (this) {
                 state.put("MinValue", minValue);
@@ -486,7 +474,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public synchronized void restoreState(Map<String, Object> state) {
+        public synchronized void restore(Map<String, Object> state) {
             minValue = (Long) state.get("MinValue");
             minDeque = (Deque<Long>) state.get("MinDeque");
         }
@@ -497,4 +485,14 @@ protected Object currentValue() {
 
     }
 
+    abstract class MinAggregatorState extends State {
+        public abstract Object processAdd(Object data);
+
+        public abstract Object processRemove(Object data);
+
+        public abstract Object reset();
+
+        protected abstract Object currentValue();
+    }
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregatorExecutor.java
similarity index 69%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregatorExecutor.java
index ebc9af0371..4b5a9f5e0c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregatorExecutor.java
@@ -27,6 +27,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.Arrays;
@@ -34,7 +36,7 @@
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate min value for life time based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate min value for life time based on an event attribute.
  */
 @Extension(
         name = "minForever",
@@ -57,9 +59,10 @@
                         "the lifetime of the query."
         )
 )
-public class MinForeverAttributeAggregator extends AttributeAggregator {
+public class MinForeverAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<MinForeverAttributeAggregatorExecutor.MinAggregatorState> {
 
-    private MinForeverAttributeAggregator minForeverAttributeAggregator;
+    private Attribute.Type returnType;
 
     /**
      * The initialization method for FunctionExecutor
@@ -67,95 +70,80 @@ public class MinForeverAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link MinForeverAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link MinForeverAttributeAggregatorExecutor}
+     *                                    configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<MinAggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                    ProcessingMode processingMode,
+                                                    boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                    SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("MinForever aggregator has to have exactly 1 parameter, " +
                     "currently " + attributeExpressionExecutors.length + " parameters provided");
         }
-        Attribute.Type type = attributeExpressionExecutors[0].getReturnType();
-        switch (type) {
-            case FLOAT:
-                minForeverAttributeAggregator = new MinForeverAttributeAggregatorFloat();
-                break;
-            case INT:
-                minForeverAttributeAggregator = new MinForeverAttributeAggregatorInt();
-                break;
-            case LONG:
-                minForeverAttributeAggregator = new MinForeverAttributeAggregatorLong();
-                break;
-            case DOUBLE:
-                minForeverAttributeAggregator = new MinForeverAttributeAggregatorDouble();
-                break;
-            default:
-                throw new OperationNotSupportedException("MinForever not supported for " + type);
-        }
+        returnType = attributeExpressionExecutors[0].getReturnType();
+        return new StateFactory<MinAggregatorState>() {
+            @Override
+            public MinAggregatorState createNewState() {
+                switch (returnType) {
+                    case FLOAT:
+                        return new MinForeverAttributeAggregatorStateFloat();
+                    case INT:
+                        return new MinForeverAttributeAggregatorStateInt();
+                    case LONG:
+                        return new MinForeverAttributeAggregatorStateLong();
+                    case DOUBLE:
+                        return new MinForeverAttributeAggregatorStateDouble();
+                    default:
+                        throw new OperationNotSupportedException("MinForever not supported for " + returnType);
+                }
+            }
+        };
+
     }
 
     public Attribute.Type getReturnType() {
-        return minForeverAttributeAggregator.getReturnType();
+        return returnType;
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, MinAggregatorState state) {
         if (data == null) {
-            return minForeverAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return minForeverAttributeAggregator.processAdd(data);
+        return state.processAdd(data);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, MinAggregatorState state) {
         // will not occur
         return new IllegalStateException("MinForever cannot process data array, but found " +
                 Arrays.deepToString(data));
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, MinAggregatorState state) {
         if (data == null) {
-            return minForeverAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return minForeverAttributeAggregator.processRemove(data);
+        return state.processRemove(data);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, MinAggregatorState state) {
         // will not occur
         return new IllegalStateException("MinForever cannot process data array, but found " +
                 Arrays.deepToString(data));
     }
 
-    protected Object currentValue() {
-        return null;
-    }
-
-    @Override
-    public boolean canDestroy() {
-        return false;
-    }
-
     @Override
-    public Object reset() {
-        return minForeverAttributeAggregator.reset();
+    public Object reset(MinAggregatorState state) {
+        return state.reset();
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return minForeverAttributeAggregator.currentState();
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        minForeverAttributeAggregator.restoreState(state);
-    }
-
-    class MinForeverAttributeAggregatorDouble extends MinForeverAttributeAggregator {
+    class MinForeverAttributeAggregatorStateDouble extends MinAggregatorState {
 
         private final Attribute.Type type = Attribute.Type.DOUBLE;
         private volatile Double minValue = null;
@@ -188,14 +176,14 @@ public Object reset() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("MinValue", minValue);
             return state;
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             minValue = (Double) state.get("MinValue");
         }
 
@@ -203,9 +191,14 @@ protected Object currentValue() {
             return minValue;
         }
 
+        @Override
+        public boolean canDestroy() {
+            return minValue == null;
+        }
+
     }
 
-    class MinForeverAttributeAggregatorFloat extends MinForeverAttributeAggregator {
+    class MinForeverAttributeAggregatorStateFloat extends MinAggregatorState {
 
         private final Attribute.Type type = Attribute.Type.FLOAT;
         private volatile Float minValue = null;
@@ -238,23 +231,28 @@ public Object reset() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("MinValue", minValue);
             return state;
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             minValue = (Float) state.get("MinValue");
         }
 
         protected Object currentValue() {
             return minValue;
         }
+
+        @Override
+        public boolean canDestroy() {
+            return minValue == null;
+        }
     }
 
-    class MinForeverAttributeAggregatorInt extends MinForeverAttributeAggregator {
+    class MinForeverAttributeAggregatorStateInt extends MinAggregatorState {
 
         private final Attribute.Type type = Attribute.Type.INT;
         private volatile Integer minValue = null;
@@ -287,23 +285,28 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("MinValue", minValue);
             return state;
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             minValue = (Integer) state.get("MinValue");
         }
 
         protected Object currentValue() {
             return minValue;
         }
+
+        @Override
+        public boolean canDestroy() {
+            return minValue == null;
+        }
     }
 
-    class MinForeverAttributeAggregatorLong extends MinForeverAttributeAggregator {
+    class MinForeverAttributeAggregatorStateLong extends MinAggregatorState {
 
         private final Attribute.Type type = Attribute.Type.LONG;
         private volatile Long minValue = null;
@@ -336,14 +339,19 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public boolean canDestroy() {
+            return minValue == null;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("MinValue", minValue);
             return state;
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             minValue = (Long) state.get("MinValue");
         }
 
@@ -352,4 +360,14 @@ protected Object currentValue() {
         }
     }
 
+    abstract class MinAggregatorState extends State {
+        public abstract Object processAdd(Object data);
+
+        public abstract Object processRemove(Object data);
+
+        public abstract Object reset();
+
+        protected abstract Object currentValue();
+    }
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/OrAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/OrAttributeAggregatorExecutor.java
similarity index 62%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/OrAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/OrAttributeAggregatorExecutor.java
index e47d1f6589..edf021c02b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/OrAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/OrAttributeAggregatorExecutor.java
@@ -27,13 +27,15 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate sum based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate sum based on an event attribute.
  */
 @Extension(
         name = "or",
@@ -57,10 +59,10 @@
                 )
         }
 )
-public class OrAttributeAggregator extends AttributeAggregator {
+public class OrAttributeAggregatorExecutor extends
+        AttributeAggregatorExecutor<OrAttributeAggregatorExecutor.AggregatorState> {
 
     private static Attribute.Type type = Attribute.Type.BOOL;
-    private int trueEventsCount = 0;
 
     /**
      * The initialization method for FunctionExecutor
@@ -68,18 +70,20 @@ public class OrAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link OrAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link OrAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<AggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                 ProcessingMode processingMode,
+                                                 boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                 SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("And aggregator has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length
                     + " parameters provided");
         }
+        return () -> new AggregatorState();
     }
 
     public Attribute.Type getReturnType() {
@@ -87,65 +91,69 @@ public Attribute.Type getReturnType() {
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, AggregatorState state) {
         if ((boolean) data) {
-            trueEventsCount++;
+            state.trueEventsCount++;
         }
-        return computeLogicalOperation();
+        return computeLogicalOperation(state);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, AggregatorState state) {
         for (Object object : data) {
             if ((boolean) object) {
-                trueEventsCount++;
+                state.trueEventsCount++;
             }
         }
-        return computeLogicalOperation();
+        return computeLogicalOperation(state);
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, AggregatorState state) {
         if ((boolean) data) {
-            trueEventsCount--;
+            state.trueEventsCount--;
         }
-        return computeLogicalOperation();
+        return computeLogicalOperation(state);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, AggregatorState state) {
         for (Object object : data) {
             if ((boolean) object) {
-                trueEventsCount--;
+                state.trueEventsCount--;
             }
         }
-        return computeLogicalOperation();
-    }
-
-    private boolean computeLogicalOperation() {
-        return trueEventsCount > 0;
+        return computeLogicalOperation(state);
     }
 
     @Override
-    public Object reset() {
-        trueEventsCount = 0;
+    public Object reset(AggregatorState state) {
+        state.trueEventsCount = 0;
         return false;
     }
 
-    @Override
-    public boolean canDestroy() {
-        return trueEventsCount == 0;
+    private boolean computeLogicalOperation(AggregatorState state) {
+        return state.trueEventsCount > 0;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("trueEventsCount", trueEventsCount);
-        return state;
-    }
+    class AggregatorState extends State {
+        private int trueEventsCount = 0;
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        trueEventsCount = (int) state.get("trueEventsCount");
+        @Override
+        public boolean canDestroy() {
+            return trueEventsCount == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("TrueEventsCount", trueEventsCount);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            trueEventsCount = (int) state.get("TrueEventsCount");
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorExecutor.java
similarity index 70%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorExecutor.java
index 615b6b7f5f..acaea2c1d5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorExecutor.java
@@ -28,6 +28,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.Arrays;
@@ -35,7 +37,7 @@
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate standard deviation based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate standard deviation based on an event attribute.
  */
 @Extension(
         name = "stdDev",
@@ -57,8 +59,9 @@
                         "based on their arrival and expiry."
         )
 )
-public class StdDevAttributeAggregator extends AttributeAggregator {
-    private StdDevAttributeAggregator stdDevOutputAttributeAggregator;
+public class StdDevAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<StdDevAttributeAggregatorExecutor.AggregatorState> {
+    private Attribute.Type returnType;
 
     /**
      * The initialization method for FunctionExecutor
@@ -66,106 +69,85 @@ public class StdDevAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link StdDevAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link StdDevAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<AggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                 ProcessingMode processingMode,
+                                                 boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                 SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("stdDev aggregator has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length
                     + " parameters provided");
         }
-
+        returnType = Attribute.Type.DOUBLE;
         Attribute.Type type = attributeExpressionExecutors[0].getReturnType();
+        return () -> {
+            switch (type) {
+                case INT:
+                    return new StdDevAttributeAggregatorStateInt();
+                case LONG:
+                    return new StdDevAttributeAggregatorStateLong();
+                case FLOAT:
+                    return new StdDevAttributeAggregatorStateFloat();
+                case DOUBLE:
+                    return new StdDevAttributeAggregatorStateDouble();
+                default:
+                    throw new OperationNotSupportedException("stdDev not supported for " + returnType);
+            }
+        };
 
-        switch (type) {
-            case INT:
-                stdDevOutputAttributeAggregator = new StdDevAttributeAggregatorInt();
-                break;
-            case LONG:
-                stdDevOutputAttributeAggregator = new StdDevAttributeAggregatorLong();
-                break;
-            case FLOAT:
-                stdDevOutputAttributeAggregator = new StdDevAttributeAggregatorFloat();
-                break;
-            case DOUBLE:
-                stdDevOutputAttributeAggregator = new StdDevAttributeAggregatorDouble();
-                break;
-            default:
-                throw new OperationNotSupportedException("stdDev not supported for " + type);
-        }
     }
 
     @Override
     public Attribute.Type getReturnType() {
-        return stdDevOutputAttributeAggregator.getReturnType();
+        return returnType;
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, AggregatorState state) {
         if (data == null) {
-            return stdDevOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return stdDevOutputAttributeAggregator.processAdd(data);
+        return state.processAdd(data);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, AggregatorState state) {
         return new IllegalStateException("stdDev cannot process data array, but found " + Arrays.deepToString(data));
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, AggregatorState state) {
         if (data == null) {
-            return stdDevOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return stdDevOutputAttributeAggregator.processRemove(data);
+        return state.processRemove(data);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, AggregatorState state) {
         return new IllegalStateException("stdDev cannot process data array, but found " + Arrays.deepToString(data));
     }
 
-    protected Object currentValue() {
-        return null;
-    }
-
     @Override
-    public boolean canDestroy() {
-        return stdDevOutputAttributeAggregator.canDestroy();
-    }
-
-    @Override
-    public Object reset() {
-        return stdDevOutputAttributeAggregator.reset();
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return stdDevOutputAttributeAggregator.currentState();
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        stdDevOutputAttributeAggregator.restoreState(state);
+    public Object reset(AggregatorState state) {
+        return state.reset();
     }
 
     /**
      * Standard deviation abstrct aggregator for Double values
      */
-    private abstract class StdDevAbstractAttributeAggregatorDouble extends StdDevAttributeAggregator {
-        private final Attribute.Type type = Attribute.Type.DOUBLE;
+    abstract class AggregatorState extends State {
+
         private double mean, stdDeviation, sum;
         private int count = 0;
 
-        @Override
-        public Attribute.Type getReturnType() {
-            return type;
-        }
+        public abstract Object processRemove(Object data);
+
+        public abstract Object processAdd(Object data);
 
         public Object processAdd(double value) {
             // See here for the algorithm: http://www.johndcook.com/blog/standard_deviation/
@@ -204,7 +186,6 @@ public Object processRemove(double value) {
             return Math.sqrt(stdDeviation / count);
         }
 
-        @Override
         public Object reset() {
             sum = mean = 0.0;
             stdDeviation = 0.0;
@@ -218,7 +199,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("Sum", sum);
             state.put("Mean", mean);
@@ -228,7 +209,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             sum = (Long) state.get("Sum");
             mean = (Long) state.get("Mean");
             stdDeviation = (Long) state.get("stdDeviation");
@@ -248,7 +229,7 @@ protected Object currentValue() {
     /**
      * Standard deviation aggregator for Double values
      */
-    private class StdDevAttributeAggregatorDouble extends StdDevAbstractAttributeAggregatorDouble {
+    private class StdDevAttributeAggregatorStateDouble extends AggregatorState {
         @Override
         public Object processAdd(Object data) {
             return processAdd(((Double) data).doubleValue());
@@ -263,7 +244,7 @@ public Object processRemove(Object data) {
     /**
      * Standard deviation aggregator for Float values
      */
-    private class StdDevAttributeAggregatorFloat extends StdDevAbstractAttributeAggregatorDouble {
+    private class StdDevAttributeAggregatorStateFloat extends AggregatorState {
         @Override
         public Object processAdd(Object data) {
             return processAdd(((Float) data).doubleValue());
@@ -278,7 +259,7 @@ public Object processRemove(Object data) {
     /**
      * Standard deviation aggregator for Integer values
      */
-    private class StdDevAttributeAggregatorInt extends StdDevAbstractAttributeAggregatorDouble {
+    private class StdDevAttributeAggregatorStateInt extends AggregatorState {
         @Override
         public Object processAdd(Object data) {
             return processAdd(((Integer) data).doubleValue());
@@ -293,7 +274,7 @@ public Object processRemove(Object data) {
     /**
      * Standard deviation aggregator for Long values
      */
-    private class StdDevAttributeAggregatorLong extends StdDevAbstractAttributeAggregatorDouble {
+    private class StdDevAttributeAggregatorStateLong extends AggregatorState {
         @Override
         public Object processAdd(Object data) {
             return processAdd(((Long) data).doubleValue());
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/SumAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/SumAttributeAggregatorExecutor.java
similarity index 72%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/SumAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/SumAttributeAggregatorExecutor.java
index 9aac305b2b..1862f5b30e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/SumAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/SumAttributeAggregatorExecutor.java
@@ -27,6 +27,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.Arrays;
@@ -34,7 +36,7 @@
 import java.util.Map;
 
 /**
- * {@link AttributeAggregator} to calculate sum based on an event attribute.
+ * {@link AttributeAggregatorExecutor} to calculate sum based on an event attribute.
  */
 @Extension(
         name = "sum",
@@ -59,9 +61,10 @@
                 )
         }
 )
-public class SumAttributeAggregator extends AttributeAggregator {
+public class SumAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<SumAttributeAggregatorExecutor.AggregatorState> {
 
-    private SumAttributeAggregator sumOutputAttributeAggregator;
+    private Attribute.Type returnType;
 
     /**
      * The initialization method for FunctionExecutor
@@ -69,13 +72,14 @@ public class SumAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link SumAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link SumAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<AggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                 ProcessingMode processingMode,
+                                                 boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                 SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("Sum aggregator has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length
@@ -83,81 +87,76 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, Processin
         }
         Attribute.Type type = attributeExpressionExecutors[0].getReturnType();
         switch (type) {
-            case FLOAT:
-                sumOutputAttributeAggregator = new SumAttributeAggregatorFloat();
-                break;
             case INT:
-                sumOutputAttributeAggregator = new SumAttributeAggregatorInt();
-                break;
             case LONG:
-                sumOutputAttributeAggregator = new SumAttributeAggregatorLong();
+                returnType = Attribute.Type.LONG;
                 break;
+            case FLOAT:
             case DOUBLE:
-                sumOutputAttributeAggregator = new SumAttributeAggregatorDouble();
+                returnType = Attribute.Type.DOUBLE;
                 break;
             default:
-                throw new OperationNotSupportedException("Sum not supported for " + type);
+                throw new OperationNotSupportedException("Sum not supported for " + returnType);
         }
+        return new StateFactory<AggregatorState>() {
+            @Override
+            public AggregatorState createNewState() {
+                switch (type) {
+                    case FLOAT:
+                        return new AggregatorStateFloat();
+                    case INT:
+                        return new AggregatorStateInt();
+                    case LONG:
+                        return new AggregatorStateLong();
+                    case DOUBLE:
+                        return new AggregatorStateDouble();
+                    default:
+                        throw new OperationNotSupportedException("Sum not supported for " + returnType);
+                }
+            }
+        };
+
 
     }
 
     public Attribute.Type getReturnType() {
-        return sumOutputAttributeAggregator.getReturnType();
+        return returnType;
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, AggregatorState state) {
         if (data == null) {
-            return sumOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return sumOutputAttributeAggregator.processAdd(data);
+        return state.processAdd(data);
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, AggregatorState state) {
         // will not occur
         return new IllegalStateException("Sin cannot process data array, but found " + Arrays.deepToString(data));
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, AggregatorState state) {
         if (data == null) {
-            return sumOutputAttributeAggregator.currentValue();
+            return state.currentValue();
         }
-        return sumOutputAttributeAggregator.processRemove(data);
+        return state.processRemove(data);
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, AggregatorState state) {
         // will not occur
         return new IllegalStateException("Sin cannot process data array, but found " + Arrays.deepToString(data));
     }
 
-    protected Object currentValue() {
-        return null;
-    }
-
     @Override
-    public boolean canDestroy() {
-        return sumOutputAttributeAggregator.canDestroy();
+    public Object reset(AggregatorState state) {
+        return state.reset();
     }
 
-    @Override
-    public Object reset() {
-        return sumOutputAttributeAggregator.reset();
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return sumOutputAttributeAggregator.currentState();
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        sumOutputAttributeAggregator.restoreState(state);
-    }
-
-    class SumAttributeAggregatorDouble extends SumAttributeAggregator {
+    class AggregatorStateDouble extends AggregatorState {
 
         private final Attribute.Type type = Attribute.Type.DOUBLE;
         private double sum = 0.0;
@@ -196,6 +195,7 @@ public Object processRemove(double data) {
         @Override
         public Object reset() {
             sum = 0.0;
+            count = 0;
             return null;
         }
 
@@ -205,7 +205,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("Sum", sum);
             state.put("Count", count);
@@ -213,7 +213,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             sum = (double) state.get("Sum");
             count = (long) state.get("Count");
         }
@@ -228,7 +228,7 @@ protected Object currentValue() {
 
     }
 
-    class SumAttributeAggregatorFloat extends SumAttributeAggregatorDouble {
+    class AggregatorStateFloat extends AggregatorStateDouble {
 
         @Override
         public Object processAdd(Object data) {
@@ -248,7 +248,7 @@ public Object processRemove(Object data) {
 
     }
 
-    class SumAttributeAggregatorLong extends SumAttributeAggregator {
+    class AggregatorStateLong extends AggregatorState {
 
         private final Attribute.Type type = Attribute.Type.LONG;
         private long sum = 0L;
@@ -288,6 +288,7 @@ public Object processRemove(double data) {
 
         public Object reset() {
             sum = 0L;
+            count = 0;
             return sum;
         }
 
@@ -298,7 +299,7 @@ public boolean canDestroy() {
 
 
         @Override
-        public Map<String, Object> currentState() {
+        public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("Sum", sum);
             state.put("Count", count);
@@ -306,7 +307,7 @@ public Map<String, Object> currentState() {
         }
 
         @Override
-        public void restoreState(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             sum = (long) state.get("Sum");
             count = (long) state.get("Count");
         }
@@ -321,7 +322,7 @@ protected Object currentValue() {
 
     }
 
-    class SumAttributeAggregatorInt extends SumAttributeAggregatorLong {
+    class AggregatorStateInt extends AggregatorStateLong {
 
         @Override
         public Object processAdd(Object data) {
@@ -335,4 +336,15 @@ public Object processRemove(Object data) {
 
     }
 
+    abstract class AggregatorState extends State {
+
+        protected abstract Object currentValue();
+
+        public abstract Object processAdd(Object data);
+
+        public abstract Object processRemove(Object data);
+
+        public abstract Object reset();
+
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregatorExecutor.java
similarity index 64%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregatorExecutor.java
index 447aea5957..cffe104233 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregatorExecutor.java
@@ -27,6 +27,8 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.HashMap;
@@ -35,7 +37,7 @@
 import java.util.Set;
 
 /**
- * {@link AttributeAggregator} to return a union of an aggregation of sets.
+ * {@link AttributeAggregatorExecutor} to return a union of an aggregation of sets.
  */
 @Extension(
         name = "unionSet",
@@ -62,13 +64,8 @@
                         "stock symbols received during a sliding window of 10 seconds."
         )
 )
-public class UnionSetAttributeAggregator extends AttributeAggregator {
-
-    /**
-     * This map aggregates the count per each distinct element
-     */
-    private Map<Object, Integer> counter = null;
-    private Set set = new HashSet();
+public class UnionSetAttributeAggregatorExecutor
+        extends AttributeAggregatorExecutor<UnionSetAttributeAggregatorExecutor.AggregatorState> {
 
     /**
      * The initialization method for FunctionExecutor
@@ -76,13 +73,14 @@ public class UnionSetAttributeAggregator extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link CountAttributeAggregator} configuration reader.
+     * @param configReader                 this hold the {@link CountAttributeAggregatorExecutor} configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<AggregatorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                                 ProcessingMode processingMode,
+                                                 boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                                 SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new OperationNotSupportedException("unionSet aggregator has to have exactly 1 parameter, currently " +
                     attributeExpressionExecutors.length + " parameters provided");
@@ -91,9 +89,8 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, Processin
             throw new OperationNotSupportedException("Parameter passed to unionSet aggregator should be of type" +
                     " object but found: " + attributeExpressionExecutors[0].getReturnType());
         }
-        if (processingMode == ProcessingMode.SLIDE || outputExpectsExpiredEvents) {
-            counter = new HashMap<>();
-        }
+        return () -> new AggregatorState(processingMode, outputExpectsExpiredEvents);
+
     }
 
     public Attribute.Type getReturnType() {
@@ -101,87 +98,104 @@ public Attribute.Type getReturnType() {
     }
 
     @Override
-    public Object processAdd(Object data) {
+    public Object processAdd(Object data, AggregatorState state) {
         Set inputSet = (Set) data;
         for (Object o : inputSet) {
-            set.add(o);
-            if (counter != null) {
-                Integer currentCount = counter.get(o);
+            state.set.add(o);
+            if (state.counter != null) {
+                Integer currentCount = state.counter.get(o);
                 if (currentCount == null) {
-                    counter.put(o, 1);
+                    state.counter.put(o, 1);
                 } else {
-                    counter.put(o, currentCount + 1);
+                    state.counter.put(o, currentCount + 1);
                 }
             }
         }
         // Creating a new set object as the returned set reference is kept until the aggregated values are
         // inserted into the store
         Set returnSet = new HashSet();
-        returnSet.addAll(set);
+        returnSet.addAll(state.set);
         return returnSet;
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, AggregatorState state) {
         //UnionSet can have only one input parameter, hence this will not be invoked.
         return null;
     }
 
     @Override
-    public Object processRemove(Object data) {
+    public Object processRemove(Object data, AggregatorState state) {
         Set newSet = (Set) data;
         for (Object o : newSet) {
-            if (counter != null) {
-                Integer currentCount = counter.get(o);
+            if (state.counter != null) {
+                Integer currentCount = state.counter.get(o);
                 if (currentCount == null) {
                     //means o does not exist in the counter map or in the set hence doing nothing
                 } else if (currentCount == 0) {
                     throw new IllegalStateException("Error occurred when removing element from " +
                             "union-set for element: " + o.toString());
                 } else if (currentCount == 1) {
-                    set.remove(o);
+                    state.set.remove(o);
                 } else {
-                    counter.put(o, currentCount - 1);
+                    state.counter.put(o, currentCount - 1);
                 }
             } else {
-                set.remove(o);
+                state.set.remove(o);
             }
         }
         Set returnSet = new HashSet();
-        returnSet.addAll(set);
+        returnSet.addAll(state.set);
         return returnSet;
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, AggregatorState state) {
         //UnionSet can have only one input parameter, hence this will not be invoked.
         return null;
     }
 
     @Override
-    public Object reset() {
-        set.clear();
-        counter.clear();
+    public Object reset(AggregatorState state) {
+        state.set.clear();
+        if (state.counter != null) {
+            state.counter.clear();
+        }
         Set returnSet = new HashSet();
         return returnSet;   // returning an empty set.
     }
 
-    @Override
-    public boolean canDestroy() {
-        return set.size() == 0;
-    }
+    class AggregatorState extends State {
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("Set", set);
-        state.put("Counter", counter);
-        return state;
-    }
+        /**
+         * This map aggregates the count per each distinct element
+         */
+        private Map<Object, Integer> counter = null;
+        private Set set = new HashSet();
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        set = (Set) state.get("Set");
-        counter = (Map) state.get("Counter");
+        public AggregatorState(ProcessingMode processingMode, boolean outputExpectsExpiredEvents) {
+            if (processingMode == ProcessingMode.SLIDE || outputExpectsExpiredEvents) {
+                counter = new HashMap<>();
+            }
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return set.size() == 0;
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("Set", set);
+            state.put("Counter", counter);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            set = (Set) state.get("Set");
+            counter = (Map) state.get("Counter");
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/AttributeProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/AttributeProcessor.java
index 4b4f9e89f0..35889f221f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/AttributeProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/AttributeProcessor.java
@@ -41,13 +41,6 @@ public void process(ComplexEvent event) {
         event.setOutputData(expressionExecutor.execute(event), outputPosition);
     }
 
-    public AttributeProcessor cloneProcessor(String key) {
-        AttributeProcessor attributeProcessor = new AttributeProcessor(expressionExecutor.cloneExecutor(key));
-        attributeProcessor.setOutputPosition(this.outputPosition);
-        return attributeProcessor;
-
-    }
-
     public int getOutputPosition() {
         return outputPosition;
     }
@@ -60,7 +53,4 @@ public ExpressionExecutor getExpressionExecutor() {
         return expressionExecutor;
     }
 
-    public void clean() {
-        expressionExecutor.clean();
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/AbstractAggregationAttributeExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/AbstractAggregationAttributeExecutor.java
deleted file mode 100644
index 429328c09a..0000000000
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/AbstractAggregationAttributeExecutor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.core.query.selector.attribute.processor.executor;
-
-import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.executor.ExpressionExecutor;
-import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator;
-import io.siddhi.core.util.snapshot.Snapshotable;
-import io.siddhi.query.api.definition.Attribute;
-
-/**
- * Abstract class to represent attribute aggregations.
- */
-public abstract class AbstractAggregationAttributeExecutor implements ExpressionExecutor, Snapshotable {
-    protected AttributeAggregator attributeAggregator;
-    protected ExpressionExecutor[] attributeExpressionExecutors;
-    protected SiddhiQueryContext siddhiQueryContext;
-    protected int size;
-    private String elementId = null;
-
-    public AbstractAggregationAttributeExecutor(AttributeAggregator attributeAggregator,
-                                                ExpressionExecutor[] attributeExpressionExecutors,
-                                                SiddhiQueryContext siddhiQueryContext) {
-        this.siddhiQueryContext = siddhiQueryContext;
-        this.attributeExpressionExecutors = attributeExpressionExecutors;
-        this.attributeAggregator = attributeAggregator;
-        this.size = attributeExpressionExecutors.length;
-        if (elementId == null) {
-            elementId = "AbstractAggregationAttributeExecutor-" +
-                    this.siddhiQueryContext.getSiddhiAppContext().getElementIdGenerator().createNewId();
-        }
-        this.siddhiQueryContext.getSiddhiAppContext().getSnapshotService().addSnapshotable(
-                siddhiQueryContext.getName(), this);
-    }
-
-    @Override
-    public Attribute.Type getReturnType() {
-        return attributeAggregator.getReturnType();
-    }
-
-    @Override
-    public String getElementId() {
-        return elementId;
-    }
-
-    @Override
-    public void clean() {
-        for (ExpressionExecutor expressionExecutor : attributeExpressionExecutors) {
-            expressionExecutor.clean();
-        }
-        attributeAggregator.clean();
-        siddhiQueryContext.getSiddhiAppContext().getSnapshotService().removeSnapshotable(
-                siddhiQueryContext.getName(), this);
-    }
-}
-
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/AggregationAttributeExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/AggregationAttributeExecutor.java
deleted file mode 100644
index cab51caa3c..0000000000
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/AggregationAttributeExecutor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.core.query.selector.attribute.processor.executor;
-
-import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.ComplexEvent;
-import io.siddhi.core.executor.ExpressionExecutor;
-import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator;
-
-import java.util.Map;
-
-/**
- * Executor for attribute aggregations.
- */
-public class AggregationAttributeExecutor extends AbstractAggregationAttributeExecutor {
-
-    public AggregationAttributeExecutor(AttributeAggregator attributeAggregator,
-                                        ExpressionExecutor[] attributeExpressionExecutors,
-                                        SiddhiQueryContext siddhiQueryContext) {
-        super(attributeAggregator, attributeExpressionExecutors, siddhiQueryContext);
-    }
-
-    @Override
-    public Object execute(ComplexEvent event) {
-        return attributeAggregator.process(event);
-    }
-
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new AggregationAttributeExecutor(attributeAggregator.cloneAggregator(key),
-                attributeExpressionExecutors, siddhiQueryContext);
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        return attributeAggregator.currentState();
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        attributeAggregator.restoreState(state);
-    }
-}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/GroupByAggregationAttributeExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/GroupByAggregationAttributeExecutor.java
deleted file mode 100644
index a354950153..0000000000
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/processor/executor/GroupByAggregationAttributeExecutor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.core.query.selector.attribute.processor.executor;
-
-import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.ComplexEvent;
-import io.siddhi.core.executor.ExpressionExecutor;
-import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator;
-import io.siddhi.core.util.config.ConfigReader;
-import io.siddhi.core.util.timestamp.TimestampGenerator;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Executor class for aggregations with group by configuration.
- */
-public class GroupByAggregationAttributeExecutor extends AbstractAggregationAttributeExecutor {
-
-    private static final ThreadLocal<String> keyThreadLocal = new ThreadLocal<String>();
-    private final ConfigReader configReader;
-    private final TimestampGenerator timestampGenerator;
-    protected Map<String, AttributeAggregator> aggregatorMap = new HashMap<String, AttributeAggregator>();
-    protected Set<String> obsoleteAggregatorKeys = new HashSet<>();
-    protected long lastCleanupTimestamp = 0;
-
-    public GroupByAggregationAttributeExecutor(AttributeAggregator attributeAggregator,
-                                               ExpressionExecutor[] attributeExpressionExecutors,
-                                               ConfigReader configReader, SiddhiQueryContext siddhiQueryContext) {
-        super(attributeAggregator, attributeExpressionExecutors, siddhiQueryContext);
-        this.configReader = configReader;
-        timestampGenerator = this.siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator();
-        lastCleanupTimestamp = timestampGenerator.currentTime();
-    }
-
-    public static ThreadLocal<String> getKeyThreadLocal() {
-        return keyThreadLocal;
-    }
-
-    @Override
-    public Object execute(ComplexEvent event) {
-
-        long currentTime = timestampGenerator.currentTime();
-        boolean canClean = false;
-        if (lastCleanupTimestamp + 5000 < currentTime || obsoleteAggregatorKeys.size() > 25) {
-            lastCleanupTimestamp = currentTime;
-            canClean = true;
-        }
-
-        if (event.getType() == ComplexEvent.Type.RESET) {
-            Object aOutput = null;
-            if (canClean) {
-                for (Map.Entry<String, AttributeAggregator> attributeAggregatorEntry : aggregatorMap.entrySet()) {
-                    aOutput = attributeAggregatorEntry.getValue().process(event);
-                    attributeAggregatorEntry.getValue().clean();
-                }
-                aggregatorMap.clear();
-                obsoleteAggregatorKeys.clear();
-            } else {
-                for (Map.Entry<String, AttributeAggregator> attributeAggregatorEntry : aggregatorMap.entrySet()) {
-                    aOutput = attributeAggregatorEntry.getValue().process(event);
-                }
-            }
-            return aOutput;
-        }
-
-        String key = keyThreadLocal.get();
-        AttributeAggregator currentAttributeAggregator = aggregatorMap.get(key);
-        if (currentAttributeAggregator == null) {
-            currentAttributeAggregator = attributeAggregator.cloneAggregator(key);
-            aggregatorMap.put(key, currentAttributeAggregator);
-        }
-        Object results = currentAttributeAggregator.process(event);
-        if (event.getType() == ComplexEvent.Type.EXPIRED && currentAttributeAggregator.canDestroy()) {
-            obsoleteAggregatorKeys.add(key);
-        }
-        if (canClean) {
-            destroyObsoleteAggregators();
-        }
-        return results;
-    }
-
-    public ExpressionExecutor cloneExecutor(String key) {
-        return new GroupByAggregationAttributeExecutor(attributeAggregator.cloneAggregator(key),
-                attributeExpressionExecutors, configReader,
-                siddhiQueryContext);
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        for (Map.Entry<String, AttributeAggregator> entry : aggregatorMap.entrySet()) {
-            state.put(entry.getKey(), entry.getValue().currentState());
-        }
-        return state;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        for (HashMap.Entry<String, Object> item : state.entrySet()) {
-            String key = item.getKey();
-            AttributeAggregator aAttributeAggregator = attributeAggregator.cloneAggregator(key);
-            aAttributeAggregator.restoreState((Map<String, Object>) item.getValue());
-            aggregatorMap.put(key, aAttributeAggregator);
-        }
-    }
-
-    private void destroyObsoleteAggregators() {
-        for (String obsoleteKey : obsoleteAggregatorKeys) {
-            AttributeAggregator attributeAggregator = aggregatorMap.get(obsoleteKey);
-            if (attributeAggregator != null && attributeAggregator.canDestroy()) {
-                attributeAggregator.clean();
-                aggregatorMap.remove(obsoleteKey);
-            }
-        }
-        obsoleteAggregatorKeys.clear();
-    }
-}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/InMemorySource.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/InMemorySource.java
index cea5c71ec9..ce75fa9dfd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/InMemorySource.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/InMemorySource.java
@@ -29,8 +29,6 @@
 import io.siddhi.core.util.transport.OptionHolder;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
-
 /**
  * Implementation of {@link Source} to receive events through in-memory transport.
  */
@@ -103,13 +101,4 @@ public void resume() {
         InMemoryBroker.subscribe(subscriber);
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        // no state
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/Source.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/Source.java
index dabd182183..2b7c2dbfbd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/Source.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/Source.java
@@ -23,7 +23,6 @@
 import io.siddhi.core.util.ExceptionUtil;
 import io.siddhi.core.util.StringUtil;
 import io.siddhi.core.util.config.ConfigReader;
-import io.siddhi.core.util.snapshot.Snapshotable;
 import io.siddhi.core.util.transport.BackoffRetryCounter;
 import io.siddhi.core.util.transport.OptionHolder;
 import io.siddhi.query.api.definition.StreamDefinition;
@@ -39,12 +38,11 @@
  * transports. Each source represent a transport type. Whenever Siddhi need to support a new transport, a new Event
  * source should be implemented.
  */
-public abstract class Source implements Snapshotable {
+public abstract class Source {
     private static final Logger LOG = Logger.getLogger(Source.class);
     private String type;
     private SourceMapper mapper;
     private StreamDefinition streamDefinition;
-    private String elementId;
     private SiddhiAppContext siddhiAppContext;
 
     private AtomicBoolean isTryingToConnect = new AtomicBoolean(false);
@@ -66,7 +64,6 @@ public final void init(String sourceType, OptionHolder transportOptionHolder, So
                 sourceHandler, mapperConfigReader, siddhiAppContext);
         this.mapper = sourceMapper;
         this.streamDefinition = streamDefinition;
-        this.elementId = siddhiAppContext.getElementIdGenerator().createNewId();
         this.siddhiAppContext = siddhiAppContext;
         init(sourceMapper, transportOptionHolder, transportPropertyNames, configReader, siddhiAppContext);
         scheduledExecutorService = siddhiAppContext.getScheduledExecutorService();
@@ -174,16 +171,6 @@ public void shutdown() {
         }
     }
 
-    @Override
-    public final String getElementId() {
-        return elementId;
-    }
-
-    @Override
-    public void clean() {
-        //ignore
-    }
-
     public String getType() {
         return type;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/SourceHandler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/SourceHandler.java
index aa8f8a595d..0797f99883 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/SourceHandler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/SourceHandler.java
@@ -18,49 +18,64 @@
 
 package io.siddhi.core.stream.input.source;
 
+import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.event.Event;
 import io.siddhi.core.stream.input.InputHandler;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.definition.StreamDefinition;
 
 /**
  * SourceHandler is an optional implementable class that wraps {@link InputHandler}.
  * It will do optional processing to the events before sending the events to the input handler
+ *
+ * @param <S> current state for the Source Holder
  */
-public abstract class SourceHandler implements InputEventHandlerCallback, Snapshotable {
+public abstract class SourceHandler<S extends State> implements InputEventHandlerCallback {
 
-    private String elementId;
     private InputHandler inputHandler;
+    private StateHolder<S> stateHolder;
+    private String id;
 
-    final void initSourceHandler(String siddhiAppName, SourceSyncCallback sourceSyncCallback, String elementId,
-                                 StreamDefinition streamDefinition) {
-        this.elementId = elementId;
-        init(siddhiAppName, sourceSyncCallback, elementId, streamDefinition);
+    final void initSourceHandler(String siddhiAppName, SourceSyncCallback sourceSyncCallback,
+                                 StreamDefinition streamDefinition, SiddhiAppContext siddhiAppContext) {
+        StateFactory<S> stateFactory = init(siddhiAppName, sourceSyncCallback, streamDefinition, siddhiAppContext);
+        id = siddhiAppName + "-" + streamDefinition.getId() + "-" + this.getClass().getName();
+        stateHolder = siddhiAppContext.generateStateHolder(
+                streamDefinition.getId() + "-" + this.getClass().getName(),
+                stateFactory);
     }
 
-    public abstract void init(String siddhiAppName, SourceSyncCallback sourceSyncCallback, String elementId,
-                              StreamDefinition streamDefinition);
+    public abstract StateFactory init(String siddhiAppName, SourceSyncCallback sourceSyncCallback,
+                                      StreamDefinition streamDefinition, SiddhiAppContext siddhiAppContext);
 
     @Override
     public void sendEvent(Event event, String[] transportSyncProperties) throws InterruptedException {
-        sendEvent(event, transportSyncProperties, inputHandler);
+        S state = stateHolder.getState();
+        try {
+            sendEvent(event, transportSyncProperties, state, inputHandler);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void sendEvents(Event[] events, String[] transportSyncProperties) throws InterruptedException {
-        sendEvent(events, transportSyncProperties, inputHandler);
+        S state = stateHolder.getState();
+        try {
+            sendEvent(events, transportSyncProperties, state, inputHandler);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
-    public abstract void sendEvent(Event event, String[] transportSyncProperties, InputHandler inputHandler)
+    public abstract void sendEvent(Event event, String[] transportSyncProperties, S state, InputHandler inputHandler)
             throws InterruptedException;
 
-    public abstract void sendEvent(Event[] events, String[] transportSyncProperties, InputHandler inputHandler)
+    public abstract void sendEvent(Event[] events, String[] transportSyncProperties, S state, InputHandler inputHandler)
             throws InterruptedException;
 
-    public String getElementId() {
-        return elementId;
-    }
-
     public InputHandler getInputHandler() {
         return inputHandler;
     }
@@ -69,8 +84,7 @@ public void setInputHandler(InputHandler inputHandler) {
         this.inputHandler = inputHandler;
     }
 
-    @Override
-    public void clean() {
-        //ignore
+    public String getId() {
+        return id;
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/SourceMapper.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/SourceMapper.java
index 915030306d..5d806aa2b7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/SourceMapper.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/source/SourceMapper.java
@@ -60,8 +60,8 @@ public final void init(StreamDefinition streamDefinition, String mapType, Option
         this.sourceType = sourceType;
         this.transportMappings = transportMappings;
         if (sourceHandler != null) {
-            sourceHandler.initSourceHandler(siddhiAppContext.getName(), sourceSyncCallback,
-                    siddhiAppContext.getElementIdGenerator().createNewId(), streamDefinition);
+            sourceHandler.initSourceHandler(siddhiAppContext.getName(), sourceSyncCallback, streamDefinition,
+                    siddhiAppContext);
         }
         this.sourceHandler = sourceHandler;
         this.siddhiAppContext = siddhiAppContext;
@@ -105,7 +105,6 @@ public final void setInputHandler(InputHandler inputHandler) {
         } else {
             inputEventHandlerCallback = new PassThroughSourceHandler(inputHandler);
         }
-        LatencyTracker mapperLatencyTracker = null;
         this.inputEventHandler = new InputEventHandler(inputHandler, transportMappings,
                 trpProperties, trpSyncProperties, sourceType, mapperLatencyTracker, siddhiAppContext,
                 inputEventHandlerCallback);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/InMemorySink.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/InMemorySink.java
index 87afd4f9a7..55062e8fb3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/InMemorySink.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/InMemorySink.java
@@ -33,8 +33,6 @@
 import io.siddhi.query.api.definition.StreamDefinition;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
-
 /**
  * Implementation of {@link Sink} which represents in-memory transport. This implementation can send incoming objects
  * to in-memory transport within JVM.
@@ -99,13 +97,4 @@ public void publish(Object payload, DynamicOptions dynamicOptions) throws Connec
         }
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        // no state
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/LogSink.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/LogSink.java
index afafc24b72..d3dc50225d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/LogSink.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/LogSink.java
@@ -31,7 +31,6 @@
 import org.apache.log4j.Logger;
 
 import java.util.Arrays;
-import java.util.Map;
 
 /**
  * Implementation of {@link Sink} which can be used as a logger. This will log the output events in the output stream
@@ -166,16 +165,6 @@ public void destroy() {
         // do nothing
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        // no state
-    }
-
     private enum LogPriority {
         INFO,
         DEBUG,
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/Sink.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/Sink.java
index 3f763e27b7..1a07761b9a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/Sink.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/Sink.java
@@ -27,7 +27,6 @@
 import io.siddhi.core.util.StringUtil;
 import io.siddhi.core.util.config.ConfigReader;
 import io.siddhi.core.util.parser.helper.QueryParserHelper;
-import io.siddhi.core.util.snapshot.Snapshotable;
 import io.siddhi.core.util.statistics.LatencyTracker;
 import io.siddhi.core.util.statistics.ThroughputTracker;
 import io.siddhi.core.util.transport.BackoffRetryCounter;
@@ -46,7 +45,7 @@
  * This is a Sink type. these let users to publish events according to
  * some type. this type can either be local, jms or ws (or any custom extension)
  */
-public abstract class Sink implements SinkListener, Snapshotable {
+public abstract class Sink implements SinkListener {
 
     private static final Logger LOG = Logger.getLogger(Sink.class);
     protected AtomicBoolean isTryingToConnect = new AtomicBoolean(false);
@@ -55,7 +54,6 @@ public abstract class Sink implements SinkListener, Snapshotable {
     private SinkMapper mapper;
     private SinkHandler handler;
     private DistributedTransport.ConnectionCallback connectionCallback = null;
-    private String elementId;
     private SiddhiAppContext siddhiAppContext;
     private OnErrorAction onErrorAction;
     private BackoffRetryCounter backoffRetryCounter = new BackoffRetryCounter();
@@ -72,7 +70,6 @@ public final void init(StreamDefinition streamDefinition, String type, OptionHol
                            ConfigReader mapperConfigReader, SiddhiAppContext siddhiAppContext) {
         this.streamDefinition = streamDefinition;
         this.type = type;
-        this.elementId = siddhiAppContext.getElementIdGenerator().createNewId();
         this.siddhiAppContext = siddhiAppContext;
         this.onErrorAction = OnErrorAction.valueOf(transportOptionHolder
                 .getOrCreateOption(SiddhiConstants.ANNOTATION_ELEMENT_ON_ERROR, "LOG")
@@ -93,8 +90,8 @@ public final void init(StreamDefinition streamDefinition, String type, OptionHol
             this.mapper = sinkMapper;
         }
         if (sinkHandler != null) {
-            sinkHandler.initSinkHandler(siddhiAppContext.getElementIdGenerator().createNewId(), streamDefinition,
-                    new SinkHandlerCallback(sinkMapper));
+            sinkHandler.initSinkHandler(siddhiAppContext.getName(), streamDefinition,
+                    new SinkHandlerCallback(sinkMapper), siddhiAppContext);
             this.handler = sinkHandler;
         }
 
@@ -112,7 +109,6 @@ public final void initOnlyTransport(StreamDefinition streamDefinition, OptionHol
         this.type = type;
         this.streamDefinition = streamDefinition;
         this.connectionCallback = connectionCallback;
-        this.elementId = siddhiAppContext.getElementIdGenerator().createNewId();
         this.siddhiAppContext = siddhiAppContext;
         init(streamDefinition, transportOptionHolder, sinkConfigReader, siddhiAppContext);
         scheduledExecutorService = siddhiAppContext.getScheduledExecutorService();
@@ -249,16 +245,6 @@ public void shutdown() {
         }
     }
 
-    @Override
-    public final String getElementId() {
-        return elementId;
-    }
-
-    @Override
-    public void clean() {
-        //ignore
-    }
-
     void setTrpDynamicOptions(ThreadLocal<DynamicOptions> trpDynamicOptions) {
         this.trpDynamicOptions = trpDynamicOptions;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/SinkHandler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/SinkHandler.java
index 05f5e633b9..794861bbc0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/SinkHandler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/sink/SinkHandler.java
@@ -18,47 +18,66 @@
 
 package io.siddhi.core.stream.output.sink;
 
+import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.event.Event;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.definition.StreamDefinition;
 
 /**
  * SinkHandler is an optional interface before {@link SinkMapper}.
  * It will do optional processing to the events before sending the events to the desired mapper
+ *
+ * @param <S> current state for the Sink Holder
  */
-public abstract class SinkHandler implements Snapshotable {
+public abstract class SinkHandler<S extends State> {
 
     private SinkHandlerCallback sinkHandlerCallback;
-    private String elementId;
+    private StateHolder<S> stateHolder;
+    private String id;
 
-    final void initSinkHandler(String elementId, StreamDefinition streamDefinition,
-                               SinkHandlerCallback sinkHandlerCallback) {
+    final void initSinkHandler(String siddhiAppName, StreamDefinition streamDefinition,
+                               SinkHandlerCallback sinkHandlerCallback,
+                               SiddhiAppContext siddhiAppContext) {
         this.sinkHandlerCallback = sinkHandlerCallback;
-        this.elementId = elementId;
-        init(elementId, streamDefinition, sinkHandlerCallback);
+        StateFactory<S> stateFactory = init(streamDefinition, sinkHandlerCallback);
+        id = siddhiAppName + "-" + streamDefinition.getId() + "-" + this.getClass().getName();
+        stateHolder = siddhiAppContext.generateStateHolder(
+                streamDefinition.getId() + "-" + this.getClass().getName(),
+                stateFactory);
     }
 
-    public abstract void init(String elementId, StreamDefinition streamDefinition,
-                              SinkHandlerCallback sinkHandlerCallback);
+    public abstract StateFactory<S> init(StreamDefinition streamDefinition,
+                                         SinkHandlerCallback sinkHandlerCallback);
 
     public void handle(Event event) {
-        handle(event, sinkHandlerCallback);
+        S state = stateHolder.getState();
+        try {
+            handle(event, sinkHandlerCallback, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     public void handle(Event[] events) {
-        handle(events, sinkHandlerCallback);
+        if (stateHolder != null) {
+            S state = stateHolder.getState();
+            try {
+                handle(events, sinkHandlerCallback, state);
+            } finally {
+                stateHolder.returnState(state);
+            }
+        } else {
+            handle(events, sinkHandlerCallback, null);
+        }
     }
 
-    public abstract void handle(Event event, SinkHandlerCallback sinkHandlerCallback);
-
-    public abstract void handle(Event[] events, SinkHandlerCallback sinkHandlerCallback);
+    public abstract void handle(Event event, SinkHandlerCallback sinkHandlerCallback, S state);
 
-    public String getElementId() {
-        return elementId;
-    }
+    public abstract void handle(Event[] events, SinkHandlerCallback sinkHandlerCallback, S state);
 
-    @Override
-    public void clean() {
-        //ignore
+    public String getId() {
+        return id;
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/InMemoryTable.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/InMemoryTable.java
index 9c9fe10367..a44817d80d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/InMemoryTable.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/InMemoryTable.java
@@ -39,8 +39,9 @@
 import io.siddhi.core.util.parser.EventHolderPasser;
 import io.siddhi.core.util.parser.ExpressionParser;
 import io.siddhi.core.util.parser.OperatorParser;
-import io.siddhi.core.util.snapshot.Snapshotable;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.definition.TableDefinition;
 import io.siddhi.query.api.execution.query.output.stream.UpdateSet;
 import io.siddhi.query.api.expression.Expression;
@@ -54,14 +55,12 @@
 /**
  * In-memory event table implementation of SiddhiQL.
  */
-public class InMemoryTable extends Table implements Snapshotable {
+public class InMemoryTable extends Table {
 
     private TableDefinition tableDefinition;
     private StreamEventCloner tableStreamEventCloner;
     private ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
-    private EventHolder eventHolder;
-    private String elementId;
-    private SiddhiAppContext siddhiAppContext;
+    private StateHolder<TableState> stateHolder;
 
     @Override
     public void init(TableDefinition tableDefinition, StreamEventPool storeEventPool,
@@ -69,14 +68,10 @@ public void init(TableDefinition tableDefinition, StreamEventPool storeEventPool
                      RecordTableHandler recordTableHandler) {
         this.tableDefinition = tableDefinition;
         this.tableStreamEventCloner = storeEventCloner;
-        this.siddhiAppContext = siddhiAppContext;
+        EventHolder eventHolder = EventHolderPasser.parse(tableDefinition, storeEventPool, siddhiAppContext);
 
-        eventHolder = EventHolderPasser.parse(tableDefinition, storeEventPool, siddhiAppContext);
-
-        if (elementId == null) {
-            elementId = "InMemoryTable-" + siddhiAppContext.getElementIdGenerator().createNewId();
-        }
-        siddhiAppContext.getSnapshotService().addSnapshotable(tableDefinition.getId(), this);
+        stateHolder = siddhiAppContext.generateStateHolder(tableDefinition.getId(),
+                () -> new TableState(eventHolder));
     }
 
     @Override
@@ -86,10 +81,12 @@ public TableDefinition getTableDefinition() {
 
     @Override
     public void add(ComplexEventChunk<StreamEvent> addingEventChunk) {
+        readWriteLock.writeLock().lock();
+        TableState state = stateHolder.getState();
         try {
-            readWriteLock.writeLock().lock();
-            eventHolder.add(addingEventChunk);
+            state.eventHolder.add(addingEventChunk);
         } finally {
+            stateHolder.returnState(state);
             readWriteLock.writeLock().unlock();
         }
 
@@ -97,10 +94,12 @@ public void add(ComplexEventChunk<StreamEvent> addingEventChunk) {
 
     @Override
     public void delete(ComplexEventChunk<StateEvent> deletingEventChunk, CompiledCondition compiledCondition) {
+        readWriteLock.writeLock().lock();
+        TableState state = stateHolder.getState();
         try {
-            readWriteLock.writeLock().lock();
-            ((Operator) compiledCondition).delete(deletingEventChunk, eventHolder);
+            ((Operator) compiledCondition).delete(deletingEventChunk, state.eventHolder);
         } finally {
+            stateHolder.returnState(state);
             readWriteLock.writeLock().unlock();
         }
     }
@@ -108,11 +107,13 @@ public void delete(ComplexEventChunk<StateEvent> deletingEventChunk, CompiledCon
     @Override
     public void update(ComplexEventChunk<StateEvent> updatingEventChunk, CompiledCondition compiledCondition,
                        CompiledUpdateSet compiledUpdateSet) {
+        readWriteLock.writeLock().lock();
+        TableState state = stateHolder.getState();
         try {
-            readWriteLock.writeLock().lock();
-            ((Operator) compiledCondition).update(updatingEventChunk, eventHolder,
+            ((Operator) compiledCondition).update(updatingEventChunk, state.eventHolder,
                     (InMemoryCompiledUpdateSet) compiledUpdateSet);
         } finally {
+            stateHolder.returnState(state);
             readWriteLock.writeLock().unlock();
         }
 
@@ -123,17 +124,19 @@ public void updateOrAdd(ComplexEventChunk<StateEvent> updateOrAddingEventChunk,
                             CompiledCondition compiledCondition,
                             CompiledUpdateSet compiledUpdateSet,
                             AddingStreamEventExtractor addingStreamEventExtractor) {
+        readWriteLock.writeLock().lock();
+        TableState state = stateHolder.getState();
         try {
-            readWriteLock.writeLock().lock();
             ComplexEventChunk<StreamEvent> failedEvents = ((Operator) compiledCondition).tryUpdate(
                     updateOrAddingEventChunk,
-                    eventHolder,
+                    state.eventHolder,
                     (InMemoryCompiledUpdateSet) compiledUpdateSet,
                     addingStreamEventExtractor);
             if (failedEvents != null) {
-                eventHolder.add(failedEvents);
+                state.eventHolder.add(failedEvents);
             }
         } finally {
+            stateHolder.returnState(state);
             readWriteLock.writeLock().unlock();
         }
 
@@ -141,10 +144,12 @@ public void updateOrAdd(ComplexEventChunk<StateEvent> updateOrAddingEventChunk,
 
     @Override
     public boolean contains(StateEvent matchingEvent, CompiledCondition compiledCondition) {
+        readWriteLock.readLock().lock();
+        TableState state = stateHolder.getState();
         try {
-            readWriteLock.readLock().lock();
-            return ((Operator) compiledCondition).contains(matchingEvent, eventHolder);
+            return ((Operator) compiledCondition).contains(matchingEvent, state.eventHolder);
         } finally {
+            stateHolder.returnState(state);
             readWriteLock.readLock().unlock();
         }
 
@@ -167,10 +172,12 @@ protected void destroy() {
 
     @Override
     public StreamEvent find(CompiledCondition compiledCondition, StateEvent matchingEvent) {
+        TableState state = stateHolder.getState();
+        readWriteLock.readLock().lock();
         try {
-            readWriteLock.readLock().lock();
-            return ((Operator) compiledCondition).find(matchingEvent, eventHolder, tableStreamEventCloner);
+            return ((Operator) compiledCondition).find(matchingEvent, state.eventHolder, tableStreamEventCloner);
         } finally {
+            stateHolder.returnState(state);
             readWriteLock.readLock().unlock();
         }
     }
@@ -179,8 +186,13 @@ public StreamEvent find(CompiledCondition compiledCondition, StateEvent matching
     public CompiledCondition compileCondition(Expression condition, MatchingMetaInfoHolder matchingMetaInfoHolder,
                                               List<VariableExpressionExecutor> variableExpressionExecutors,
                                               Map<String, Table> tableMap, SiddhiQueryContext siddhiQueryContext) {
-        return OperatorParser.constructOperator(eventHolder, condition, matchingMetaInfoHolder,
-                variableExpressionExecutors, tableMap, siddhiQueryContext);
+        TableState state = stateHolder.getState();
+        try {
+            return OperatorParser.constructOperator(state.eventHolder, condition, matchingMetaInfoHolder,
+                    variableExpressionExecutors, tableMap, siddhiQueryContext);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
@@ -201,26 +213,29 @@ public CompiledUpdateSet compileUpdateSet(UpdateSet updateSet, MatchingMetaInfoH
         return new InMemoryCompiledUpdateSet(expressionExecutorMap);
     }
 
+    class TableState extends State {
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("EventHolder", eventHolder.getSnapshot());
-        return state;
-    }
+        private final EventHolder eventHolder;
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        eventHolder.restore((SnapshotStateList) state.get("EventHolder"));
-    }
+        public TableState(EventHolder eventHolder) {
+            this.eventHolder = eventHolder;
+        }
 
-    @Override
-    public String getElementId() {
-        return elementId;
-    }
+        @Override
+        public boolean canDestroy() {
+            return false;
+        }
 
-    @Override
-    public void clean() {
-        siddhiAppContext.getSnapshotService().removeSnapshotable(tableDefinition.getId(), this);
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("EventHolder", eventHolder.getSnapshot());
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            eventHolder.restore((SnapshotStateList) state.get("EventHolder"));
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/EventHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/EventHolder.java
index 9814793237..2354b7a268 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/EventHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/EventHolder.java
@@ -20,7 +20,7 @@
 
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.util.snapshot.state.SnapshotState;
+import io.siddhi.core.util.snapshot.state.Snapshot;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
 
 /**
@@ -30,7 +30,7 @@
 public interface EventHolder {
     void add(ComplexEventChunk<StreamEvent> addingEventChunk);
 
-    SnapshotState getSnapshot();
+    Snapshot getSnapshot();
 
     void restore(SnapshotStateList snapshotStatelist);
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/IndexEventHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/IndexEventHolder.java
index 3bd48d6fcc..aaef9b2c77 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/IndexEventHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/IndexEventHolder.java
@@ -28,7 +28,7 @@
 import io.siddhi.core.exception.OperationNotSupportedException;
 import io.siddhi.core.util.SiddhiConstants;
 import io.siddhi.core.util.snapshot.SnapshotRequest;
-import io.siddhi.core.util.snapshot.state.SnapshotState;
+import io.siddhi.core.util.snapshot.state.Snapshot;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
 import io.siddhi.query.api.definition.AbstractDefinition;
 import io.siddhi.query.api.expression.condition.Compare;
@@ -617,23 +617,23 @@ private boolean isFullSnapshot() {
                 || SnapshotRequest.isRequestForFullSnapshot();
     }
 
-    public SnapshotState getSnapshot() {
+    public Snapshot getSnapshot() {
         if (isFullSnapshot()) {
             forceFullSnapshot = false;
-            return new SnapshotState(this, false);
+            return new Snapshot(this, false);
         } else {
-            SnapshotState snapshot = new SnapshotState(operationChangeLog, true);
+            Snapshot snapshot = new Snapshot(operationChangeLog, true);
             operationChangeLog = new ArrayList<>();
             return snapshot;
         }
     }
 
     public void restore(SnapshotStateList snapshotStatelist) {
-        TreeMap<Long, SnapshotState> revisions = snapshotStatelist.getSnapshotStates();
-        Iterator<Map.Entry<Long, SnapshotState>> itr = revisions.entrySet().iterator();
+        TreeMap<Long, Snapshot> revisions = snapshotStatelist.getSnapshotStates();
+        Iterator<Map.Entry<Long, Snapshot>> itr = revisions.entrySet().iterator();
         this.isOperationLogEnabled = false;
         while (itr.hasNext()) {
-            Map.Entry<Long, SnapshotState> snapshotEntry = itr.next();
+            Map.Entry<Long, Snapshot> snapshotEntry = itr.next();
             if (!snapshotEntry.getValue().isIncrementalSnapshot()) {
                 this.deleteAll();
                 IndexEventHolder snapshotEventHolder = (IndexEventHolder) snapshotEntry.getValue().getState();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractQueryableRecordTable.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractQueryableRecordTable.java
index f6fb142941..a4989734f4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractQueryableRecordTable.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractQueryableRecordTable.java
@@ -255,14 +255,6 @@ private class RecordStoreCompiledSelection implements CompiledSelection {
             this.compiledSelection = compiledSelection;
         }
 
-        @Override
-        public CompiledSelection cloneCompilation(String key) {
-            Map<String, ExpressionExecutor> newVariableExpressionExecutorMap = new HashMap<>();
-            for (Map.Entry<String, ExpressionExecutor> entry : variableExpressionExecutorMap.entrySet()) {
-                newVariableExpressionExecutorMap.put(entry.getKey(), entry.getValue().cloneExecutor(key));
-            }
-            return new RecordStoreCompiledSelection(newVariableExpressionExecutorMap, compiledSelection);
-        }
     }
 
     /**
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractRecordTable.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractRecordTable.java
index 981d619660..9091fc43a1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractRecordTable.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractRecordTable.java
@@ -62,8 +62,8 @@ public void init(TableDefinition tableDefinition, StreamEventPool storeEventPool
                      StreamEventCloner storeEventCloner, ConfigReader configReader, SiddhiAppContext
                              siddhiAppContext, RecordTableHandler recordTableHandler) {
         if (recordTableHandler != null) {
-            recordTableHandler.init(siddhiAppContext.getElementIdGenerator().createNewId(), tableDefinition,
-                    new RecordTableHandlerCallback(this));
+            recordTableHandler.init(tableDefinition, new RecordTableHandlerCallback(this),
+                    siddhiAppContext);
         }
         this.recordTableHandler = recordTableHandler;
         this.storeEventPool = storeEventPool;
@@ -402,14 +402,6 @@ protected class RecordStoreCompiledCondition implements CompiledCondition {
             this.compiledCondition = compiledCondition;
         }
 
-        @Override
-        public CompiledCondition cloneCompilation(String key) {
-            Map<String, ExpressionExecutor> newVariableExpressionExecutorMap = new HashMap<>();
-            for (Map.Entry<String, ExpressionExecutor> entry : variableExpressionExecutorMap.entrySet()) {
-                newVariableExpressionExecutorMap.put(entry.getKey(), entry.getValue().cloneExecutor(key));
-            }
-            return new RecordStoreCompiledCondition(newVariableExpressionExecutorMap, compiledCondition);
-        }
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/RecordTableHandler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/RecordTableHandler.java
index 840a90f1df..e3221fc353 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/RecordTableHandler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/RecordTableHandler.java
@@ -16,10 +16,14 @@
 
 package io.siddhi.core.table.record;
 
+import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.exception.ConnectionUnavailableException;
 import io.siddhi.core.util.collection.operator.CompiledCondition;
 import io.siddhi.core.util.collection.operator.CompiledExpression;
 import io.siddhi.core.util.collection.operator.CompiledSelection;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.definition.TableDefinition;
 
@@ -31,33 +35,46 @@
 /**
  * RecordTableHandler is an optional handler that can be implemented to do processing on output events before sending
  * to the AbstractRecordTable.
+ *
+ * @param <S> current state
  */
-public abstract class RecordTableHandler {
+public abstract class RecordTableHandler<S extends State> {
 
-    private String elementId;
+    private String id;
     private RecordTableHandlerCallback recordTableHandlerCallback;
+    private StateHolder<S> stateHolder;
+
+    protected final void init(TableDefinition tableDefinition, RecordTableHandlerCallback recordTableHandlerCallback,
+                              SiddhiAppContext siddhiAppContext) {
+        this.recordTableHandlerCallback = recordTableHandlerCallback;
+
+        id = siddhiAppContext.getName() + "-" + tableDefinition.getId() + "-" + this.getClass().getName();
+        StateFactory<S> stateFactory = init(id, tableDefinition);
+        stateHolder = siddhiAppContext.generateStateHolder(
+                tableDefinition.getId() + "-" + this.getClass().getName(),
+                stateFactory);
 
-    public String getElementId() {
-        return elementId;
     }
 
-    protected final void init(String elementId, TableDefinition tableDefinition,
-                              RecordTableHandlerCallback recordTableHandlerCallback) {
-        this.elementId = elementId;
-        this.recordTableHandlerCallback = recordTableHandlerCallback;
-        init(elementId, tableDefinition);
+    public String getId() {
+        return id;
     }
 
     /**
      * Initialize the Record Table Handler
      *
-     * @param elementId       is the generated id for the record table handler
+     * @param id              is the generated id for the record table handler
      * @param tableDefinition is the definition of the table with annotations if any
      */
-    public abstract void init(String elementId, TableDefinition tableDefinition);
+    public abstract StateFactory<S> init(String id, TableDefinition tableDefinition);
 
     public void add(long timestamp, List<Object[]> records) throws ConnectionUnavailableException {
-        add(timestamp, records, recordTableHandlerCallback);
+        S state = stateHolder.getState();
+        try {
+            add(timestamp, records, recordTableHandlerCallback, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     /**
@@ -65,15 +82,21 @@ public void add(long timestamp, List<Object[]> records) throws ConnectionUnavail
      * @param records                    records that need to be added to the table, each Object[] represent a
      *                                   record and it will match the attributes of the Table Definition.
      * @param recordTableHandlerCallback call back to do operations on the record table
+     * @param state                      current state
      * @throws ConnectionUnavailableException
      */
     public abstract void add(long timestamp, List<Object[]> records,
-                             RecordTableHandlerCallback recordTableHandlerCallback)
+                             RecordTableHandlerCallback recordTableHandlerCallback, S state)
             throws ConnectionUnavailableException;
 
     public void delete(long timestamp, List<Map<String, Object>> deleteConditionParameterMaps,
                        CompiledCondition compiledCondition) throws ConnectionUnavailableException {
-        delete(timestamp, deleteConditionParameterMaps, compiledCondition, recordTableHandlerCallback);
+        S state = stateHolder.getState();
+        try {
+            delete(timestamp, deleteConditionParameterMaps, compiledCondition, recordTableHandlerCallback, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     /**
@@ -82,19 +105,25 @@ public void delete(long timestamp, List<Map<String, Object>> deleteConditionPara
      *                                     compiled condition
      * @param compiledCondition            the compiledCondition against which records should be matched for deletion
      * @param recordTableHandlerCallback   call back to do operations on the record table
+     * @param state                        current state
      * @throws ConnectionUnavailableException
      */
     public abstract void delete(long timestamp, List<Map<String, Object>> deleteConditionParameterMaps,
                                 CompiledCondition compiledCondition,
-                                RecordTableHandlerCallback recordTableHandlerCallback)
+                                RecordTableHandlerCallback recordTableHandlerCallback, S state)
             throws ConnectionUnavailableException;
 
     public void update(long timestamp, CompiledCondition compiledCondition,
                        List<Map<String, Object>> updateConditionParameterMaps,
                        LinkedHashMap<String, CompiledExpression> updateSetMap,
                        List<Map<String, Object>> updateSetParameterMaps) throws ConnectionUnavailableException {
-        update(timestamp, compiledCondition, updateConditionParameterMaps, updateSetMap, updateSetParameterMaps,
-                recordTableHandlerCallback);
+        S state = stateHolder.getState();
+        try {
+            update(timestamp, compiledCondition, updateConditionParameterMaps, updateSetMap, updateSetParameterMaps,
+                    recordTableHandlerCallback, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     /**
@@ -105,13 +134,14 @@ public void update(long timestamp, CompiledCondition compiledCondition,
      * @param updateSetExpressions         the set of updates mappings and related complied expressions
      * @param updateSetParameterMaps       map of matching StreamVariable Ids and their values corresponding to the
      * @param recordTableHandlerCallback   call back to do operations on the record table
+     * @param state                        current state
      * @throws ConnectionUnavailableException
      */
     public abstract void update(long timestamp, CompiledCondition updateCondition,
                                 List<Map<String, Object>> updateConditionParameterMaps,
                                 LinkedHashMap<String, CompiledExpression> updateSetExpressions,
                                 List<Map<String, Object>> updateSetParameterMaps,
-                                RecordTableHandlerCallback recordTableHandlerCallback)
+                                RecordTableHandlerCallback recordTableHandlerCallback, S state)
             throws ConnectionUnavailableException;
 
     public void updateOrAdd(long timestamp, CompiledCondition compiledCondition,
@@ -145,7 +175,12 @@ public abstract void updateOrAdd(long timestamp, CompiledCondition updateConditi
     public Iterator<Object[]> find(long timestamp, Map<String, Object> findConditionParameterMap,
                                    CompiledCondition compiledCondition) throws
             ConnectionUnavailableException {
-        return find(timestamp, findConditionParameterMap, compiledCondition, recordTableHandlerCallback);
+        S state = stateHolder.getState();
+        try {
+            return find(timestamp, findConditionParameterMap, compiledCondition, recordTableHandlerCallback, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     /**
@@ -154,17 +189,24 @@ public Iterator<Object[]> find(long timestamp, Map<String, Object> findCondition
      *                                   corresponding to the compiled condition
      * @param compiledCondition          the compiledCondition against which records should be matched
      * @param recordTableHandlerCallback call back to do operations on the record table
+     * @param state
      * @return RecordIterator of matching records
      * @throws ConnectionUnavailableException
      */
     public abstract Iterator<Object[]> find(long timestamp, Map<String, Object> findConditionParameterMap,
                                             CompiledCondition compiledCondition,
-                                            RecordTableHandlerCallback recordTableHandlerCallback)
+                                            RecordTableHandlerCallback recordTableHandlerCallback, S state)
             throws ConnectionUnavailableException;
 
     public boolean contains(long timestamp, Map<String, Object> containsConditionParameterMap,
                             CompiledCondition compiledCondition) throws ConnectionUnavailableException {
-        return contains(timestamp, containsConditionParameterMap, compiledCondition, recordTableHandlerCallback);
+        S state = stateHolder.getState();
+        try {
+            return contains(timestamp, containsConditionParameterMap, compiledCondition,
+                    recordTableHandlerCallback, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     /**
@@ -173,12 +215,13 @@ public boolean contains(long timestamp, Map<String, Object> containsConditionPar
      *                                      compiled condition
      * @param compiledCondition             the compiledCondition against which records should be matched
      * @param recordTableHandlerCallback    call back to do operations on the record table
+     * @param state                         current state
      * @return if matching record found or not
      * @throws ConnectionUnavailableException
      */
     public abstract boolean contains(long timestamp, Map<String, Object> containsConditionParameterMap,
                                      CompiledCondition compiledCondition,
-                                     RecordTableHandlerCallback recordTableHandlerCallback)
+                                     RecordTableHandlerCallback recordTableHandlerCallback, S state)
             throws ConnectionUnavailableException;
 
 
@@ -186,15 +229,26 @@ public abstract boolean contains(long timestamp, Map<String, Object> containsCon
     public Iterator<Object[]> query(long timestamp, Map<String, Object> parameterMap,
                                     CompiledCondition compiledCondition, CompiledSelection compiledSelection)
             throws ConnectionUnavailableException {
-        return query(timestamp, parameterMap, compiledCondition, compiledSelection, recordTableHandlerCallback);
+        S state = stateHolder.getState();
+        try {
+            return query(timestamp, parameterMap, compiledCondition, compiledSelection, recordTableHandlerCallback,
+                    state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     public Iterator<Object[]> query(long timestamp, Map<String, Object> parameterMap,
                                     CompiledCondition compiledCondition, CompiledSelection compiledSelection,
                                     Attribute[] outputAttributes)
             throws ConnectionUnavailableException {
-        return query(timestamp, parameterMap, compiledCondition, compiledSelection, outputAttributes,
-                recordTableHandlerCallback);
+        S state = stateHolder.getState();
+        try {
+            return query(timestamp, parameterMap, compiledCondition, compiledSelection, outputAttributes,
+                    recordTableHandlerCallback, state);
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     /**
@@ -204,6 +258,7 @@ public Iterator<Object[]> query(long timestamp, Map<String, Object> parameterMap
      * @param compiledCondition          the compiledCondition against which records should be matched
      * @param compiledSelection          the compiledSelection which maps the events based on selection
      * @param recordTableHandlerCallback call back to do operations on the record table
+     * @param state                      current state
      * @return RecordIterator of matching records
      * @throws ConnectionUnavailableException
      */
@@ -211,13 +266,14 @@ public Iterator<Object[]> query(long timestamp, Map<String, Object> parameterMap
     public abstract Iterator<Object[]> query(long timestamp, Map<String, Object> parameterMap,
                                              CompiledCondition compiledCondition,
                                              CompiledSelection compiledSelection,
-                                             RecordTableHandlerCallback recordTableHandlerCallback)
+                                             RecordTableHandlerCallback recordTableHandlerCallback, S state)
             throws ConnectionUnavailableException;
 
     public abstract Iterator<Object[]> query(long timestamp, Map<String, Object> parameterMap,
                                              CompiledCondition compiledCondition,
                                              CompiledSelection compiledSelection,
                                              Attribute[] outputAttributes,
-                                             RecordTableHandlerCallback recordTableHandlerCallback)
+                                             RecordTableHandlerCallback recordTableHandlerCallback, S state)
             throws ConnectionUnavailableException;
+
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/trigger/Trigger.java b/modules/siddhi-core/src/main/java/io/siddhi/core/trigger/Trigger.java
index 5643cf9cad..6abe6ff542 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/trigger/Trigger.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/trigger/Trigger.java
@@ -20,14 +20,14 @@
 
 import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.stream.StreamJunction;
-import io.siddhi.core.util.extension.holder.EternalReferencedHolder;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 import io.siddhi.query.api.definition.TriggerDefinition;
 
 /**
  * Interface class to represent event triggers. Event triggers are used to trigger events within Siddhi itself
  * according to a user given criteria.
  */
-public interface Trigger extends EternalReferencedHolder {
+public interface Trigger extends ExternalReferencedHolder {
 
     void init(TriggerDefinition triggerDefinition, SiddhiAppContext siddhiAppContext, StreamJunction
             streamJunction);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/ElementIdGenerator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/IdGenerator.java
similarity index 79%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/util/ElementIdGenerator.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/util/IdGenerator.java
index c821e1a9ca..adf4a52213 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/ElementIdGenerator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/IdGenerator.java
@@ -23,16 +23,11 @@
 /**
  * unique id generator for elements inside a given siddhi app
  */
-public class ElementIdGenerator {
+public class IdGenerator {
 
-    private String siddhiAppName;
     private AtomicLong id = new AtomicLong(0);
 
-    public ElementIdGenerator(String siddhiAppName) {
-        this.siddhiAppName = siddhiAppName;
-    }
-
     public String createNewId() {
-        return siddhiAppName + "-" + id.incrementAndGet();
+        return String.valueOf(id.incrementAndGet());
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
index 54375b4126..eee931e40f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
@@ -18,15 +18,15 @@
 
 package io.siddhi.core.util;
 
+import com.google.common.collect.TreeMultimap;
 import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventPool;
-import io.siddhi.core.event.stream.converter.ConversionStreamEventChunk;
-import io.siddhi.core.event.stream.converter.StreamEventConverter;
-import io.siddhi.core.query.input.stream.single.EntryValveProcessor;
 import io.siddhi.core.util.lock.LockWrapper;
-import io.siddhi.core.util.snapshot.Snapshotable;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.core.util.statistics.LatencyTracker;
 import io.siddhi.core.util.timestamp.TimestampGeneratorImpl;
 import org.apache.log4j.Logger;
@@ -43,62 +43,93 @@
 /**
  * Scheduler implementation to take periodic snapshots
  */
-public class Scheduler implements Snapshotable {
+public class Scheduler {
 
     private static final Logger log = Logger.getLogger(Scheduler.class);
-    private final BlockingQueue<Long> toNotifyQueue = new LinkedBlockingQueue<Long>();
     private final ThreadBarrier threadBarrier;
     private final Schedulable singleThreadEntryValve;
     private final Semaphore mutex;
     protected String queryName;
-    private SiddhiAppContext siddhiAppContext;
-    private String elementId;
+    private SiddhiQueryContext siddhiQueryContext;
     private LockWrapper lockWrapper;
     private ScheduledExecutorService scheduledExecutorService;
-    private EventCaller eventCaller;
     private StreamEventPool streamEventPool;
-    private ComplexEventChunk<StreamEvent> streamEventChunk;
     private LatencyTracker latencyTracker;
-    private volatile boolean running = false;
-    private ScheduledFuture scheduledFuture;
+    private StateHolder<SchedulerState> stateHolder;
 
 
-    public Scheduler(Schedulable singleThreadEntryValve, SiddhiAppContext siddhiAppContext) {
-        this.threadBarrier = siddhiAppContext.getThreadBarrier();
-        this.siddhiAppContext = siddhiAppContext;
+    public Scheduler(Schedulable singleThreadEntryValve, SiddhiQueryContext siddhiQueryContext) {
+        this.threadBarrier = siddhiQueryContext.getSiddhiAppContext().getThreadBarrier();
+        this.siddhiQueryContext = siddhiQueryContext;
         this.singleThreadEntryValve = singleThreadEntryValve;
-        this.scheduledExecutorService = siddhiAppContext.getScheduledExecutorService();
-        this.eventCaller = new EventCaller();
-        mutex = new Semaphore(1);
+        this.scheduledExecutorService = siddhiQueryContext.getSiddhiAppContext().getScheduledExecutorService();
+        this.mutex = new Semaphore(1);
 
-        siddhiAppContext.getTimestampGenerator()
+        siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator()
                 .addTimeChangeListener(new TimestampGeneratorImpl.TimeChangeListener() {
                     @Override
-                    public void onTimeChange(long currentTimestamp) {
-                        Long lastTime = toNotifyQueue.peek();
-                        if (lastTime != null && lastTime <= currentTimestamp) {
-                            // If executed in a separate thread, while it is processing,
-                            // the new event will come into the window. As the result of it,
-                            // the window will emit the new event as an existing current event.
-                            sendTimerEvents();
+                    public synchronized void onTimeChange(long currentTimestamp) {
+                        Map<String, SchedulerState> states = stateHolder.getAllStates();
+                        try {
+                            TreeMultimap<Long, SchedulerState> sortedExpires = TreeMultimap.create();
+                            for (Map.Entry<String, SchedulerState> stateEntry : states.entrySet()) {
+                                Long lastTime = stateEntry.getValue().toNotifyQueue.peek();
+                                if (lastTime != null && lastTime <= currentTimestamp) {
+                                    sortedExpires.put(lastTime, stateEntry.getValue());
+                                }
+                            }
+                            for (Map.Entry<Long, SchedulerState> entry : sortedExpires.entries()) {
+                                try {
+                                    SiddhiAppContext.startPartitionFlow(entry.getValue().key);
+                                    // If executed in a separate thread, while it is processing,
+                                    // the new event will come into the window. As the result of it,
+                                    // the window will emit the new event as an existing current event.
+                                    sendTimerEvents(entry.getValue());
+                                } finally {
+                                    SiddhiAppContext.stopPartitionFlow();
+                                }
+                            }
+                        } finally {
+                            stateHolder.returnStates(states);
                         }
                     }
                 });
     }
 
-    public void schedule(long time) {
-        if (!siddhiAppContext.isPlayback()) {
-            if (!running && toNotifyQueue.size() == 1) {
+    public void init(LockWrapper lockWrapper, String queryName) {
+        this.lockWrapper = lockWrapper;
+        this.queryName = queryName;
+        String id = "Scheduler_" + queryName + "_" + siddhiQueryContext.generateNewId();
+        this.stateHolder = siddhiQueryContext.generateStateHolder(id, false, () -> new SchedulerState());
+    }
+
+    public void notifyAt(long time) {
+        SchedulerState state = stateHolder.getState();
+        try {
+            // Insert the time into the queue
+            state.toNotifyQueue.put(time);
+            schedule(time, state);     // Let the subclasses to schedule the scheduler
+        } catch (InterruptedException e) {
+            log.error("Error when adding time:" + time + " to toNotifyQueue at Scheduler", e);
+        } finally {
+            stateHolder.returnState(state);
+        }
+    }
+
+    public void schedule(long time, SchedulerState state) {
+        if (!siddhiQueryContext.getSiddhiAppContext().isPlayback()) {
+            if (!state.running && state.toNotifyQueue.size() == 1) {
                 try {
                     mutex.acquire();
-                    if (!running) {
-                        running = true;
-                        long timeDiff = time - siddhiAppContext.getTimestampGenerator().currentTime();
+                    if (!state.running) {
+                        state.running = true;
+                        long timeDiff = time - siddhiQueryContext.getSiddhiAppContext().
+                                getTimestampGenerator().currentTime();
                         if (timeDiff > 0) {
-                            scheduledFuture = scheduledExecutorService.schedule(eventCaller,
+                            state.scheduledFuture = scheduledExecutorService.schedule(state.eventCaller,
                                     timeDiff, TimeUnit.MILLISECONDS);
                         } else {
-                            scheduledFuture = scheduledExecutorService.schedule(eventCaller,
+                            state.scheduledFuture = scheduledExecutorService.schedule(state.eventCaller,
                                     0, TimeUnit.MILLISECONDS);
                         }
                     }
@@ -113,60 +144,10 @@ public void schedule(long time) {
         }
     }
 
-    public Scheduler clone(String key, EntryValveProcessor entryValveProcessor) {
-        Scheduler scheduler = new Scheduler(entryValveProcessor,
-                siddhiAppContext);
-        scheduler.elementId = elementId + "-" + key;
-        return scheduler;
-    }
-
-    public void notifyAt(long time) {
-        try {
-            // Insert the time into the queue
-            toNotifyQueue.put(time);
-            schedule(time);     // Let the subclasses to schedule the scheduler
-        } catch (InterruptedException e) {
-            log.error("Error when adding time:" + time + " to toNotifyQueue at Scheduler", e);
-        }
-    }
 
     public void setStreamEventPool(StreamEventPool streamEventPool) {
         this.streamEventPool = streamEventPool;
-        streamEventChunk = new ConversionStreamEventChunk((StreamEventConverter) null, streamEventPool);
-    }
-
-    public void init(LockWrapper lockWrapper, String queryName) {
-        this.lockWrapper = lockWrapper;
-        this.queryName = queryName;
-        if (elementId == null) {
-            elementId = "Scheduler-" + siddhiAppContext.getElementIdGenerator().createNewId();
-        }
-        siddhiAppContext.getSnapshotService().addSnapshotable(queryName, this);
-    }
-
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("ToNotifyQueue", toNotifyQueue);
-        return state;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        BlockingQueue<Long> restoreToNotifyQueue = (BlockingQueue<Long>) state.get("ToNotifyQueue");
-        for (Long time : restoreToNotifyQueue) {
-            notifyAt(time);
-        }
-    }
-
-    @Override
-    public String getElementId() {
-        return elementId;
-    }
-
-    @Override
-    public void clean() {
-        siddhiAppContext.getSnapshotService().removeSnapshotable(queryName, this);
+//        streamEventChunk = new ConversionStreamEventChunk((StreamEventConverter) null, streamEventPool);
     }
 
     public void setLatencyTracker(LatencyTracker latencyTracker) {
@@ -174,24 +155,26 @@ public void setLatencyTracker(LatencyTracker latencyTracker) {
     }
 
     /**
-     * Go through the timestamps stored in the {@link #toNotifyQueue} and send the TIMER events for the expired events.
+     * Go through the timestamps stored in the toNotifyQueue and send the TIMER events for the expired events.
+     *
+     * @param state current state
      */
-    protected void sendTimerEvents() {
-        Long toNotifyTime = toNotifyQueue.peek();
-        long currentTime = siddhiAppContext.getTimestampGenerator().currentTime();
+    protected void sendTimerEvents(SchedulerState state) {
+        Long toNotifyTime = state.toNotifyQueue.peek();
+        long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
         while (toNotifyTime != null && toNotifyTime - currentTime <= 0) {
-            toNotifyQueue.poll();
-
+            state.toNotifyQueue.poll();
             StreamEvent timerEvent = streamEventPool.borrowEvent();
             timerEvent.setType(StreamEvent.Type.TIMER);
             timerEvent.setTimestamp(toNotifyTime);
-            streamEventChunk.add(timerEvent);
             if (lockWrapper != null) {
                 lockWrapper.lock();
             }
             threadBarrier.pass();
             try {
-                if (siddhiAppContext.isStatsEnabled() && latencyTracker != null) {
+                ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(false);
+                streamEventChunk.add(timerEvent);
+                if (siddhiQueryContext.getSiddhiAppContext().isStatsEnabled() && latencyTracker != null) {
                     try {
                         latencyTracker.markIn();
                         singleThreadEntryValve.process(streamEventChunk);
@@ -201,15 +184,16 @@ protected void sendTimerEvents() {
                 } else {
                     singleThreadEntryValve.process(streamEventChunk);
                 }
+            } catch (Throwable t) {
+                log.error("Error while sending timer events, " + t.getMessage(), t);
             } finally {
                 if (lockWrapper != null) {
                     lockWrapper.unlock();
                 }
             }
-            streamEventChunk.clear();
 
-            toNotifyTime = toNotifyQueue.peek();
-            currentTime = siddhiAppContext.getTimestampGenerator().currentTime();
+            toNotifyTime = state.toNotifyQueue.peek();
+            currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
         }
     }
 
@@ -217,9 +201,21 @@ protected void sendTimerEvents() {
      * Schedule events which are not scheduled in the queue when switching back from event time to system current time
      */
     public void switchToLiveMode() {
-        Long toNotifyTime = toNotifyQueue.peek();
-        if (toNotifyTime != null) {
-            schedule(toNotifyTime);
+        Map<String, SchedulerState> states = stateHolder.getAllStates();
+        try {
+            for (Map.Entry<String, SchedulerState> stateEntry : states.entrySet()) {
+                SiddhiAppContext.startPartitionFlow(stateEntry.getKey());
+                try {
+                    Long toNotifyTime = stateEntry.getValue().toNotifyQueue.peek();
+                    if (toNotifyTime != null) {
+                        schedule(toNotifyTime, stateEntry.getValue());
+                    }
+                } finally {
+                    SiddhiAppContext.stopPartitionFlow();
+                }
+            }
+        } finally {
+            stateHolder.returnStates(states);
         }
     }
 
@@ -228,14 +224,35 @@ public void switchToLiveMode() {
      * the acquired resources for processing.
      */
     public void switchToPlayBackMode() {
-        if (scheduledFuture != null) {
-            scheduledFuture.cancel(true);
+        Map<String, SchedulerState> states = stateHolder.getAllStates();
+        try {
+            for (Map.Entry<String, SchedulerState> stateEntry : states.entrySet()) {
+                SiddhiAppContext.startPartitionFlow(stateEntry.getKey());
+                try {
+                    if (stateEntry.getValue().scheduledFuture != null) {
+                        stateEntry.getValue().scheduledFuture.cancel(true);
+                    }
+                    //Make the scheduler running flag to false to make sure scheduler will schedule next time starts
+                    stateEntry.getValue().running = false;
+                } finally {
+                    SiddhiAppContext.stopPartitionFlow();
+                }
+            }
+        } finally {
+            stateHolder.returnStates(states);
         }
-        //Make the scheduler running flag to false to make sure scheduler will schedule next time starts
-        running = false;
+
     }
 
     private class EventCaller implements Runnable {
+        private SchedulerState state;
+        private String key;
+
+        public EventCaller(SchedulerState state, String key) {
+            this.state = state;
+            this.key = key;
+        }
+
         /**
          * When an object implementing interface <code>Runnable</code> is used
          * to create a thread, starting the thread causes the object's
@@ -248,24 +265,25 @@ private class EventCaller implements Runnable {
          * @see Thread#run()
          */
         @Override
-        public void run() {
+        public synchronized void run() {
+            SiddhiAppContext.startPartitionFlow(key);
             try {
-                if (!siddhiAppContext.isPlayback()) {
-                    sendTimerEvents();
+                if (!siddhiQueryContext.getSiddhiAppContext().isPlayback()) {
+                    sendTimerEvents(state);
 
-                    Long toNotifyTime = toNotifyQueue.peek();
-                    long currentTime = siddhiAppContext.getTimestampGenerator().currentTime();
+                    Long toNotifyTime = state.toNotifyQueue.peek();
+                    long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
 
                     if (toNotifyTime != null) {
-                        scheduledFuture = scheduledExecutorService.
-                                schedule(eventCaller, toNotifyTime - currentTime, TimeUnit.MILLISECONDS);
+                        state.scheduledFuture = scheduledExecutorService.
+                                schedule(this, toNotifyTime - currentTime, TimeUnit.MILLISECONDS);
                     } else {
                         try {
                             mutex.acquire();
-                            running = false;
-                            if (toNotifyQueue.peek() != null) {
-                                running = true;
-                                scheduledFuture = scheduledExecutorService.schedule(eventCaller,
+                            state.running = false;
+                            if (state.toNotifyQueue.peek() != null) {
+                                state.running = true;
+                                state.scheduledFuture = scheduledExecutorService.schedule(this,
                                         0, TimeUnit.MILLISECONDS);
                             }
                         } catch (InterruptedException e) {
@@ -276,12 +294,53 @@ public void run() {
                         }
                     }
                 } else {
-                    running = false;
+                    state.running = false;
                 }
             } catch (Throwable t) {
-                log.error(t);
+                log.error("Error while executing Scheduled Timer Event Caller, " + t.getMessage(), t);
+            } finally {
+                SiddhiAppContext.stopPartitionFlow();
             }
         }
 
     }
+
+    class SchedulerState extends State implements Comparable {
+
+        private final BlockingQueue<Long> toNotifyQueue = new LinkedBlockingQueue<Long>();
+        private final String key;
+        private volatile boolean running = false;
+        private EventCaller eventCaller;
+        private ScheduledFuture scheduledFuture;
+
+        public SchedulerState() {
+            this.key = SiddhiAppContext.getPartitionFlowId();
+            this.eventCaller = new EventCaller(this, key);
+        }
+
+        @Override
+        public boolean canDestroy() {
+            return toNotifyQueue.isEmpty() && (scheduledFuture == null || scheduledFuture.isDone());
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("ToNotifyQueue", toNotifyQueue);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            BlockingQueue<Long> restoreToNotifyQueue = (BlockingQueue<Long>) state.get("ToNotifyQueue");
+            for (Long time : restoreToNotifyQueue) {
+                notifyAt(time);
+            }
+        }
+
+        @Override
+        public int compareTo(Object o) {
+            return 0;
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiAppRuntimeBuilder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiAppRuntimeBuilder.java
index 575efd90e0..9fd8376fc4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiAppRuntimeBuilder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiAppRuntimeBuilder.java
@@ -135,8 +135,6 @@ public void defineWindow(WindowDefinition windowDefinition) {
             windowDefinition = (WindowDefinition) currentDefinition;
         }
         DefinitionParserHelper.addWindow(windowDefinition, windowMap, siddhiAppContext);
-        // defineStream(windowDefinition);
-        // DefinitionParserHelper.addStreamJunction(windowDefinition, streamJunctionMap, siddhiQueryContext);
     }
 
     public void defineTrigger(TriggerDefinition triggerDefinition) {
@@ -164,7 +162,7 @@ public void defineAggregation(AggregationDefinition aggregationDefinition) {
     }
 
     public void addPartition(PartitionRuntime partitionRuntime) {
-        partitionMap.put(partitionRuntime.getPartitionId(), partitionRuntime);
+        partitionMap.put(partitionRuntime.getPartitionName(), partitionRuntime);
     }
 
     public String addQuery(QueryRuntime queryRuntime) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
index 68b2fc0a94..789f28f6c5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
@@ -121,4 +121,6 @@ public final class SiddhiConstants {
     public static final String NAMESPACE_PURGE = "purge";
     public static final String NAMESPACE_RETENTION = "retentionPeriod";
     public static final String NAMESPACE_INTERVAL = "interval";
+
+    public static final String PARTITION_ID_DEFAULT = "_none";
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CollectionOperator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CollectionOperator.java
index f8a5f797cb..59cc8eaf86 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CollectionOperator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CollectionOperator.java
@@ -42,11 +42,6 @@ public CollectionOperator(ExpressionExecutor expressionExecutor, int storeEventP
         this.storeEventPosition = storeEventPosition;
     }
 
-    @Override
-    public CompiledCondition cloneCompilation(String key) {
-        return new CollectionOperator(expressionExecutor.cloneExecutor(key), storeEventPosition);
-    }
-
     @Override
     public StreamEvent find(StateEvent matchingEvent, Object storeEvents, StreamEventCloner storeEventCloner) {
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledCondition.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledCondition.java
index bb2d104885..d80138b394 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledCondition.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledCondition.java
@@ -23,6 +23,4 @@
  */
 public interface CompiledCondition extends CompiledExpression {
 
-    CompiledCondition cloneCompilation(String key);
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledExpression.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledExpression.java
index 5b3b1a1eae..13c9f0efc0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledExpression.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledExpression.java
@@ -23,6 +23,4 @@
  */
 public interface CompiledExpression {
 
-    CompiledExpression cloneCompilation(String key);
-
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledSelection.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledSelection.java
index ec86ddb896..176b4afe01 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledSelection.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/CompiledSelection.java
@@ -23,7 +23,5 @@
  */
 public interface CompiledSelection extends CompiledExpression {
 
-    CompiledSelection cloneCompilation(String key);
-
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/EventChunkOperator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/EventChunkOperator.java
index 8837734ff9..98141092ed 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/EventChunkOperator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/EventChunkOperator.java
@@ -40,11 +40,6 @@ public EventChunkOperator(ExpressionExecutor expressionExecutor, int storeEventP
         this.storeEventPosition = storeEventPosition;
     }
 
-    @Override
-    public CompiledCondition cloneCompilation(String key) {
-        return new EventChunkOperator(expressionExecutor.cloneExecutor(key), storeEventPosition);
-    }
-
     @Override
     public StreamEvent find(StateEvent matchingEvent, Object storeEvents, StreamEventCloner storeEventCloner) {
         ComplexEventChunk<StreamEvent> storeEventChunk = (ComplexEventChunk<StreamEvent>) storeEvents;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
index a18f79d279..68641afd9c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.aggregation.IncrementalDataAggregator;
 import io.siddhi.core.aggregation.IncrementalExecutor;
 import io.siddhi.core.aggregation.IncrementalExternalTimestampDataAggregator;
-import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
@@ -39,10 +39,8 @@
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static io.siddhi.query.api.expression.Expression.Time.normalizeDuration;
 
@@ -60,7 +58,6 @@ public class IncrementalAggregateCompileCondition implements CompiledCondition {
     private CompiledCondition inMemoryStoreCompileCondition;
     private CompiledCondition onCompiledCondition;
     private MetaStreamEvent tableMetaStreamEvent;
-    private MetaStreamEvent aggregateMetaStreamEvent;
     private ComplexEventPopulater complexEventPopulater;
     private MatchingMetaInfoHolder alteredMatchingMetaInfoHolder;
     private ExpressionExecutor perExpressionExecutor;
@@ -78,7 +75,6 @@ public IncrementalAggregateCompileCondition(
         this.inMemoryStoreCompileCondition = inMemoryStoreCompileCondition;
         this.onCompiledCondition = onCompiledCondition;
         this.tableMetaStreamEvent = tableMetaStreamEvent;
-        this.aggregateMetaStreamEvent = aggregateMetaSteamEvent;
 
         this.streamEventPoolForTableMeta = new StreamEventPool(tableMetaStreamEvent, 10);
         this.tableEventCloner = new StreamEventCloner(tableMetaStreamEvent, streamEventPoolForTableMeta);
@@ -92,29 +88,29 @@ public IncrementalAggregateCompileCondition(
         this.isProcessingOnExternalTime = isProcessingOnExternalTime;
     }
 
-    @Override
-    public CompiledCondition cloneCompilation(String key) {
-        Map<TimePeriod.Duration, CompiledCondition> copyOfWithinTableCompiledConditions = new HashMap<>();
-        for (Map.Entry<TimePeriod.Duration, CompiledCondition> entry : withinTableCompiledConditions.entrySet()) {
-            copyOfWithinTableCompiledConditions.put(entry.getKey(), entry.getValue().cloneCompilation(key));
-        }
-        return new IncrementalAggregateCompileCondition(copyOfWithinTableCompiledConditions,
-                inMemoryStoreCompileCondition.cloneCompilation(key),
-                onCompiledCondition.cloneCompilation(key), tableMetaStreamEvent, aggregateMetaStreamEvent,
-                additionalAttributes, alteredMatchingMetaInfoHolder, perExpressionExecutor,
-                startTimeEndTimeExpressionExecutor, isProcessingOnExternalTime);
-    }
+//    @Override
+//    public CompiledCondition cloneCompilation(String key) {
+//        Map<TimePeriod.Duration, CompiledCondition> copyOfWithinTableCompiledConditions = new HashMap<>();
+//        for (Map.Entry<TimePeriod.Duration, CompiledCondition> entry : withinTableCompiledConditions.entrySet()) {
+//            copyOfWithinTableCompiledConditions.put(entry.getKey(), entry.getValue().cloneCompilation(key));
+//        }
+//        return new IncrementalAggregateCompileCondition(copyOfWithinTableCompiledConditions,
+//                inMemoryStoreCompileCondition.cloneCompilation(key),
+//                onCompiledCondition.cloneCompilation(key), tableMetaStreamEvent, aggregateMetaStreamEvent,
+//                additionalAttributes, alteredMatchingMetaInfoHolder, perExpressionExecutor,
+//                startTimeEndTimeExpressionExecutor, isProcessingOnExternalTime);
+//    }
 
     public StreamEvent find(StateEvent matchingEvent, AggregationDefinition aggregationDefinition,
                             Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMap,
                             Map<TimePeriod.Duration, Table> aggregationTables,
                             List<TimePeriod.Duration> incrementalDurations,
-                            List<ExpressionExecutor> baseExecutors,
+                            List<ExpressionExecutor> baseExecutorsForFind,
                             List<ExpressionExecutor> outputExpressionExecutors,
-                            SiddhiAppContext siddhiAppContext,
-                            List<List<ExpressionExecutor>> aggregateProcessingExecutorsList,
+                            SiddhiQueryContext siddhiQueryContext,
+                            List<List<ExpressionExecutor>> aggregateProcessingExecutorsListForFind,
                             List<GroupByKeyGenerator> groupbyKeyGeneratorList,
-                            ExpressionExecutor shouldUpdateExpressionExecutor,
+                            ExpressionExecutor shouldUpdateTimestamp,
                             Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMapForPartitions) {
 
         ComplexEventChunk<StreamEvent> complexEventChunkToHoldWithinMatches = new ComplexEventChunk<>(true);
@@ -156,17 +152,17 @@ public StreamEvent find(StateEvent matchingEvent, AggregationDefinition aggregat
         long oldestInMemoryEventTimestamp = getOldestInMemoryEventTimestamp(incrementalExecutorMap,
                 incrementalDurations, perValue);
 
-        ExpressionExecutor shouldUpdateExpressionExecutorClone =
-                (shouldUpdateExpressionExecutor == null) ? null : shouldUpdateExpressionExecutor.cloneExecutor(null);
-
+//        ExpressionExecutor shouldUpdateExpressionExecutorClone =
+//                (shouldUpdateExpressionExecutor == null) ? null : shouldUpdateExpressionExecutor.cloneExecutor(null);
+//
         //If processing on external time, the in-memory data also needs to be queried
         if (isProcessingOnExternalTime || requiresAggregatingInMemoryData(oldestInMemoryEventTimestamp,
                 startTimeEndTime)) {
-            List<ExpressionExecutor> clonedBaseExecutors = baseExecutors.stream().map(expressionExecutor ->
-                    expressionExecutor.cloneExecutor("")).collect(Collectors.toList());
+//            List<ExpressionExecutor> clonedBaseExecutors = baseExecutorsForFind.stream().map(expressionExecutor ->
+//                    expressionExecutor.cloneExecutor("")).collect(Collectors.toList());
             IncrementalDataAggregator incrementalDataAggregator = new IncrementalDataAggregator(incrementalDurations,
-                    perValue, oldestInMemoryEventTimestamp, clonedBaseExecutors, tableMetaStreamEvent,
-                    siddhiAppContext, shouldUpdateExpressionExecutorClone);
+                    perValue, oldestInMemoryEventTimestamp, baseExecutorsForFind, tableMetaStreamEvent,
+                    siddhiQueryContext, shouldUpdateTimestamp, groupbyKeyGeneratorList.get(0) != null);
             ComplexEventChunk<StreamEvent> aggregatedInMemoryEventChunk;
             // Aggregate in-memory data and create an event chunk out of it
             if (incrementalExecutorMapForPartitions != null) {
@@ -176,7 +172,6 @@ public StreamEvent find(StateEvent matchingEvent, AggregationDefinition aggregat
                 aggregatedInMemoryEventChunk = incrementalDataAggregator
                         .aggregateInMemoryData(incrementalExecutorMap);
             }
-
             // Get the in-memory aggregate data, which is within given duration
             StreamEvent withinMatchFromInMemory = ((Operator) inMemoryStoreCompileCondition).find(matchingEvent,
                     aggregatedInMemoryEventChunk, tableEventCloner);
@@ -186,15 +181,16 @@ public StreamEvent find(StateEvent matchingEvent, AggregationDefinition aggregat
         ComplexEventChunk<StreamEvent> processedEvents;
         if (isProcessingOnExternalTime) {
             int durationIndex = incrementalDurations.indexOf(perValue);
-            List<ExpressionExecutor> expressionExecutors = aggregateProcessingExecutorsList.get(durationIndex);
+            List<ExpressionExecutor> expressionExecutors = aggregateProcessingExecutorsListForFind.get(durationIndex);
             GroupByKeyGenerator groupByKeyGenerator = groupbyKeyGeneratorList.get(durationIndex);
 
-            ExpressionExecutor shouldUpdateExpressionExecutorCloneExt =
-                    (shouldUpdateExpressionExecutor == null) ? null :
-                            shouldUpdateExpressionExecutor.cloneExecutor(null);
+//            ExpressionExecutor shouldUpdateExpressionExecutorCloneExt =
+//                    (shouldUpdateExpressionExecutor == null) ? null :
+//                            shouldUpdateExpressionExecutor.cloneExecutor(null);
             IncrementalExternalTimestampDataAggregator incrementalExternalTimestampDataAggregator =
                     new IncrementalExternalTimestampDataAggregator(expressionExecutors, groupByKeyGenerator,
-                            tableMetaStreamEvent, siddhiAppContext, shouldUpdateExpressionExecutorCloneExt);
+                            tableMetaStreamEvent, siddhiQueryContext,
+                            shouldUpdateTimestamp);
             processedEvents = incrementalExternalTimestampDataAggregator
                     .aggregateData(complexEventChunkToHoldWithinMatches);
         } else {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IndexOperator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IndexOperator.java
index 66d7c986a7..65c53b7013 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IndexOperator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IndexOperator.java
@@ -48,12 +48,6 @@ public IndexOperator(CollectionExecutor collectionExecutor, String queryName) {
         this.queryName = queryName;
     }
 
-    @Override
-    public CompiledCondition cloneCompilation(String key) {
-        //todo check if there are any issues when not cloning
-        return new IndexOperator(collectionExecutor, queryName);
-    }
-
     @Override
     public StreamEvent find(StateEvent matchingEvent, Object storeEvents, StreamEventCloner storeEventCloner) {
         return collectionExecutor.find(matchingEvent, (IndexedEventHolder) storeEvents, storeEventCloner);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/MapOperator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/MapOperator.java
index bf333816c9..0633d0e305 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/MapOperator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/MapOperator.java
@@ -37,11 +37,6 @@ public MapOperator(ExpressionExecutor expressionExecutor, int storeEventPosition
         super(expressionExecutor, storeEventPosition);
     }
 
-    @Override
-    public CompiledCondition cloneCompilation(String key) {
-        return new MapOperator(expressionExecutor.cloneExecutor(key), storeEventPosition);
-    }
-
     @Override
     public StreamEvent find(StateEvent matchingEvent, Object storeEvents, StreamEventCloner storeEventCloner) {
         return super.find(matchingEvent, ((Map<Object, StreamEvent>) storeEvents).values(), storeEventCloner);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/SnapshotableEventQueueOperator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/SnapshotableEventQueueOperator.java
index 81772a0118..4031de7914 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/SnapshotableEventQueueOperator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/SnapshotableEventQueueOperator.java
@@ -41,11 +41,6 @@ public SnapshotableEventQueueOperator(ExpressionExecutor expressionExecutor, int
         this.storeEventPosition = storeEventPosition;
     }
 
-    @Override
-    public CompiledCondition cloneCompilation(String key) {
-        return new SnapshotableEventQueueOperator(expressionExecutor.cloneExecutor(key), storeEventPosition);
-    }
-
     @Override
     public StreamEvent find(StateEvent matchingEvent, Object storeEvents, StreamEventCloner storeEventCloner) {
         SnapshotableStreamEventQueue storeEventQueue = (SnapshotableStreamEventQueue) storeEvents;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/AttributeAggregatorExtensionHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/AttributeAggregatorExtensionHolder.java
index f0dafb7695..c6964f2da8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/AttributeAggregatorExtensionHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/AttributeAggregatorExtensionHolder.java
@@ -18,15 +18,15 @@
 package io.siddhi.core.util.extension.holder;
 
 import io.siddhi.core.config.SiddhiAppContext;
-import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator;
+import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregatorExecutor;
 
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Holder to store {@link AttributeAggregator} Extensions.
+ * Holder to store {@link AttributeAggregatorExecutor} Extensions.
  */
 public class AttributeAggregatorExtensionHolder extends AbstractExtensionHolder {
-    private static Class clazz = AttributeAggregator.class;
+    private static Class clazz = AttributeAggregatorExecutor.class;
 
     private AttributeAggregatorExtensionHolder(SiddhiAppContext siddhiAppContext) {
         super(clazz, siddhiAppContext);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/EternalReferencedHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/ExternalReferencedHolder.java
similarity index 97%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/EternalReferencedHolder.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/ExternalReferencedHolder.java
index 0282e0a9f8..19473d2828 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/EternalReferencedHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/extension/holder/ExternalReferencedHolder.java
@@ -21,7 +21,7 @@
  * Primary interface used to give start and stop method to Siddhi components which will be called once during Siddhi
  * start up and shutting down so that user can perform actions such as resource allocation and de-allocation.
  */
-public interface EternalReferencedHolder {
+public interface ExternalReferencedHolder {
 
     /**
      * This will be called only once and this can be used to acquire
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
index c734631738..357c65d2a3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
@@ -25,7 +25,9 @@
 import io.siddhi.core.aggregation.RecreateInMemoryData;
 import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.config.SiddhiQueryContext;
+import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.stream.MetaStreamEvent;
+import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.exception.SiddhiAppCreationException;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
@@ -214,17 +216,31 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
                     .map(incrementalDuration -> constructProcessExpressionExecutors(
                             tableMap, siddhiQueryContext, baseAggregatorBeginIndex,
                             finalBaseAggregators, incomingOutputStreamDefinition, processedMetaStreamEvent,
-                            processVariableExpressionExecutors, groupBy, isProcessingOnExternalTime,
+                            processVariableExpressionExecutors, true, isProcessingOnExternalTime,
                             incrementalDuration))
                     .collect(Collectors.toList());
 
-            ExpressionExecutor shouldUpdateExpressionExecutor = null;
+            List<List<ExpressionExecutor>> processExpressionExecutorsListForFind = incrementalDurations.stream()
+                    .map(incrementalDuration -> constructProcessExpressionExecutors(
+                            tableMap, siddhiQueryContext, baseAggregatorBeginIndex,
+                            finalBaseAggregators, incomingOutputStreamDefinition, processedMetaStreamEvent,
+                            processVariableExpressionExecutors, true, isProcessingOnExternalTime,
+                            incrementalDuration))
+                    .collect(Collectors.toList());
+
+//            ExpressionExecutor shouldUpdateExpressionExecutor = null;
+            ExpressionExecutor shouldUpdateTimestamp = null;
             if (isLatestEventAdded) {
-                Expression shouldUpdateExp = AttributeFunction.function(
-                        "incrementalAggregator",
-                        "shouldUpdate",
-                        new Variable(AGG_LAST_TIMESTAMP_COL));
-                shouldUpdateExpressionExecutor = ExpressionParser.parseExpression(shouldUpdateExp,
+//                Expression shouldUpdateExp = AttributeFunction.function(
+//                        "incrementalAggregator",
+//                        "shouldUpdate",
+//                        new Variable(AGG_LAST_TIMESTAMP_COL));
+//                shouldUpdateExpressionExecutor = ExpressionParser.parseExpression(shouldUpdateExp,
+//                        processedMetaStreamEvent, 0, tableMap, processVariableExpressionExecutors,
+//                        true, 0, ProcessingMode.BATCH, false,
+//                        siddhiQueryContext);
+                Expression shouldUpdateTimestampExp = new Variable(AGG_LAST_TIMESTAMP_COL);
+                shouldUpdateTimestamp = ExpressionParser.parseExpression(shouldUpdateTimestampExp,
                         processedMetaStreamEvent, 0, tableMap, processVariableExpressionExecutors,
                         false, 0, ProcessingMode.BATCH, false,
                         siddhiQueryContext);
@@ -267,7 +283,7 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
             LockWrapper lockWrapper = new LockWrapper(aggregatorName);
             lockWrapper.setLock(new ReentrantLock());
 
-            Scheduler scheduler = SchedulerParser.parse(entryValveExecutor, siddhiAppContext);
+            Scheduler scheduler = SchedulerParser.parse(entryValveExecutor, siddhiQueryContext);
             scheduler.init(lockWrapper, aggregatorName);
             scheduler.setStreamEventPool(new StreamEventPool(processedMetaStreamEvent, 10));
 
@@ -276,7 +292,6 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
             QueryParserHelper.updateVariablePosition(incomingMetaStreamEvent, incomingVariableExpressionExecutors);
             QueryParserHelper.updateVariablePosition(processedMetaStreamEvent, processVariableExpressionExecutors);
 
-
             Map<TimePeriod.Duration, Table> aggregationTables = initDefaultTables(aggregatorName,
                     incrementalDurations, processedMetaStreamEvent.getOutputStreamDefinition(),
                     siddhiAppRuntimeBuilder, aggregationDefinition.getAnnotations(), groupByVariableList,
@@ -296,9 +311,9 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
             }
 
             Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMap = buildIncrementalExecutors(
-                    processedMetaStreamEvent, processExpressionExecutorsList,
-                    groupByKeyGeneratorList, incrementalDurations,
-                    aggregationTables, siddhiAppContext, aggregatorName, shouldUpdateExpressionExecutor);
+                    processedMetaStreamEvent, processExpressionExecutorsList, groupByKeyGeneratorList,
+                    incrementalDurations, aggregationTables, siddhiQueryContext, aggregatorName,
+                    shouldUpdateTimestamp);
 
             Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMapForPartitions = null;
             if (shardId != null) {
@@ -306,9 +321,8 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
                         buildIncrementalExecutors(
                                 processedMetaStreamEvent, processExpressionExecutorsList,
                                 groupByKeyGeneratorList, incrementalDurations,
-                                aggregationTables, siddhiAppContext, aggregatorName, shouldUpdateExpressionExecutor);
+                                aggregationTables, siddhiQueryContext, aggregatorName, shouldUpdateTimestamp);
             }
-
             IncrementalDataPurging incrementalDataPurging = new IncrementalDataPurging();
             incrementalDataPurging.init(aggregationDefinition, new StreamEventPool(processedMetaStreamEvent, 10)
                     , aggregationTables, isProcessingOnExternalTime, siddhiQueryContext);
@@ -347,16 +361,14 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
                         SiddhiConstants.METRIC_INFIX_AGGREGATIONS, SiddhiConstants.METRIC_TYPE_INSERT);
             }
 
-            List<ExpressionExecutor> baseExecutors = cloneExpressionExecutors(processExpressionExecutorsList.get(0));
-            //Remove timestamp executor
-            baseExecutors.remove(0);
             AggregationRuntime aggregationRuntime = new AggregationRuntime(aggregationDefinition,
                     incrementalExecutorMap, aggregationTables, ((SingleStreamRuntime) streamRuntime),
-                    incrementalDurations, siddhiAppContext, baseExecutors, processedMetaStreamEvent,
+                    incrementalDurations, processedMetaStreamEvent,
                     outputExpressionExecutors, latencyTrackerFind, throughputTrackerFind, recreateInMemoryData,
-                    isProcessingOnExternalTime, processExpressionExecutorsList, groupByKeyGeneratorList,
-                    incrementalDataPurging, shouldUpdateExpressionExecutor, shardId,
-                    incrementalExecutorMapForPartitions);
+                    isProcessingOnExternalTime, groupByKeyGeneratorList,
+                    incrementalDataPurging, shardId,
+                    incrementalExecutorMapForPartitions, shouldUpdateTimestamp,
+                    processExpressionExecutorsListForFind);
 
             streamRuntime.setCommonProcessor(new IncrementalAggregationProcessor(aggregationRuntime,
                     incomingExpressionExecutors, processedMetaStreamEvent, latencyTrackerInsert,
@@ -376,8 +388,8 @@ private static Map<TimePeriod.Duration, IncrementalExecutor> buildIncrementalExe
             List<GroupByKeyGenerator> groupByKeyGeneratorList,
             List<TimePeriod.Duration> incrementalDurations,
             Map<TimePeriod.Duration, Table> aggregationTables,
-            SiddhiAppContext siddhiAppContext,
-            String aggregatorName, ExpressionExecutor shouldUpdateExpressionExecutor) {
+            SiddhiQueryContext siddhiQueryContext,
+            String aggregatorName, ExpressionExecutor shouldUpdateTimestamp) {
         Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMap = new HashMap<>();
         // Create incremental executors
         IncrementalExecutor child;
@@ -391,15 +403,11 @@ private static Map<TimePeriod.Duration, IncrementalExecutor> buildIncrementalExe
             child = root;
             TimePeriod.Duration duration = incrementalDurations.get(i);
 
-            ExpressionExecutor shouldUpdateExpressionExecutorClone = null;
-            if (shouldUpdateExpressionExecutor != null) {
-                shouldUpdateExpressionExecutorClone = shouldUpdateExpressionExecutor.cloneExecutor(null);
-            }
             IncrementalExecutor incrementalExecutor = new IncrementalExecutor(duration,
-                    cloneExpressionExecutors(processExpressionExecutorsList.get(i)),
+                    new ArrayList<>(processExpressionExecutorsList.get(i)),
                     groupByKeyGeneratorList.get(i), processedMetaStreamEvent, child, isRoot,
-                    aggregationTables.get(duration), siddhiAppContext, aggregatorName,
-                    shouldUpdateExpressionExecutorClone);
+                    aggregationTables.get(duration), siddhiQueryContext, aggregatorName,
+                    shouldUpdateTimestamp);
             incrementalExecutorMap.put(duration, incrementalExecutor);
             root = incrementalExecutor;
         }
@@ -649,12 +657,6 @@ private static boolean populateIncomingAggregatorsAndExecutors(
         return addAggLastEvent;
     }
 
-    private static List<ExpressionExecutor> cloneExpressionExecutors(List<ExpressionExecutor> expressionExecutors) {
-        List<ExpressionExecutor> arrayList = expressionExecutors.stream().map(expressionExecutor ->
-                expressionExecutor.cloneExecutor(null)).collect(Collectors.toList());
-        return arrayList;
-    }
-
     private static void validateBaseAggregators(List<IncrementalAttributeAggregator> incrementalAttributeAggregators,
                                                 IncrementalAttributeAggregator incrementalAttributeAggregator,
                                                 Attribute[] baseAttributes, Expression[] baseAttributeInitialValues,
@@ -842,4 +844,38 @@ private static HashMap<TimePeriod.Duration, Table> initDefaultTables(
         }
         return aggregationTableMap;
     }
+
+    public static StreamEvent createRestEvent(MetaStreamEvent metaStreamEvent, StreamEvent streamEvent) {
+        streamEvent.setTimestamp(0);
+        streamEvent.setType(ComplexEvent.Type.RESET);
+        List<Attribute> outputData = metaStreamEvent.getOutputData();
+        for (int i = 0, outputDataSize = outputData.size(); i < outputDataSize; i++) {
+            Attribute attribute = outputData.get(i);
+            switch (attribute.getType()) {
+
+                case STRING:
+                    streamEvent.setOutputData("", i);
+                    break;
+                case INT:
+                    streamEvent.setOutputData(0, i);
+                    break;
+                case LONG:
+                    streamEvent.setOutputData(0L, i);
+                    break;
+                case FLOAT:
+                    streamEvent.setOutputData(0f, i);
+                    break;
+                case DOUBLE:
+                    streamEvent.setOutputData(0.0, i);
+                    break;
+                case BOOL:
+                    streamEvent.setOutputData(false, i);
+                    break;
+                case OBJECT:
+                    streamEvent.setOutputData(null, i);
+                    break;
+            }
+        }
+        return streamEvent;
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/ExpressionParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/ExpressionParser.java
index c139fac0ff..c6d01dac01 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/ExpressionParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/ExpressionParser.java
@@ -158,10 +158,7 @@
 import io.siddhi.core.executor.math.subtract.SubtractExpressionExecutorInt;
 import io.siddhi.core.executor.math.subtract.SubtractExpressionExecutorLong;
 import io.siddhi.core.query.processor.ProcessingMode;
-import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator;
-import io.siddhi.core.query.selector.attribute.processor.executor.AbstractAggregationAttributeExecutor;
-import io.siddhi.core.query.selector.attribute.processor.executor.AggregationAttributeExecutor;
-import io.siddhi.core.query.selector.attribute.processor.executor.GroupByAggregationAttributeExecutor;
+import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregatorExecutor;
 import io.siddhi.core.table.Table;
 import io.siddhi.core.util.ExceptionUtil;
 import io.siddhi.core.util.SiddhiClassLoader;
@@ -449,29 +446,29 @@ public static ExpressionExecutor parseExpression(Expression expression, MetaComp
                             processingMode, outputExpectsExpiredEvents, siddhiQueryContext);
 
                     expressionExecutor.initExecutor(innerExpressionExecutors,
-                            processingMode, configReader, siddhiQueryContext);
+                            processingMode, configReader, groupBy, siddhiQueryContext);
                     if (expressionExecutor.getReturnType() == Attribute.Type.BOOL) {
                         return new BoolConditionExpressionExecutor(expressionExecutor);
                     }
                     return expressionExecutor;
                 } else {
-                    AttributeAggregator attributeAggregator = (AttributeAggregator) executor;
+                    AttributeAggregatorExecutor attributeAggregatorExecutor = (AttributeAggregatorExecutor) executor;
                     Expression[] innerExpressions = ((AttributeFunction) expression).getParameters();
                     ExpressionExecutor[] innerExpressionExecutors = parseInnerExpression(innerExpressions, metaEvent,
                             currentState, tableMap, executorList, groupBy, defaultStreamEventIndex,
                             processingMode, outputExpectsExpiredEvents, siddhiQueryContext);
-                    attributeAggregator.initAggregator(innerExpressionExecutors, processingMode,
-                            outputExpectsExpiredEvents, configReader, siddhiQueryContext);
-                    AbstractAggregationAttributeExecutor aggregationAttributeProcessor;
-                    if (groupBy) {
-                        aggregationAttributeProcessor = new GroupByAggregationAttributeExecutor(attributeAggregator,
-                                innerExpressionExecutors, configReader, siddhiQueryContext);
-                    } else {
-                        aggregationAttributeProcessor = new AggregationAttributeExecutor(attributeAggregator,
-                                innerExpressionExecutors, siddhiQueryContext);
-                    }
+                    attributeAggregatorExecutor.initAggregator(innerExpressionExecutors, processingMode,
+                            outputExpectsExpiredEvents, configReader, groupBy, siddhiQueryContext);
+//                    AbstractAggregationAttributeExecutor aggregationAttributeProcessor;
+//                    if (groupBy) {
+//                        aggregationAttributeProcessor = new GroupByAggregationAttributeExecutor(attributeAggregatorExecutor,
+//                                innerExpressionExecutors, configReader, siddhiQueryContext);
+//                    } else {
+//                        aggregationAttributeProcessor = new AggregationAttributeExecutor(attributeAggregatorExecutor,
+//                                innerExpressionExecutors, siddhiQueryContext);
+//                    }
                     SelectorParser.getContainsAggregatorThreadLocal().set("true");
-                    return aggregationAttributeProcessor;
+                    return attributeAggregatorExecutor;
                 }
             } else if (expression instanceof In) {
 
@@ -1451,7 +1448,8 @@ private static ExpressionExecutor[] parseInnerExpression(Expression[] innerExpre
                                                              boolean groupBy,
                                                              int defaultStreamEventIndex,
                                                              ProcessingMode processingMode,
-                                                             boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+                                                             boolean outputExpectsExpiredEvents,
+                                                             SiddhiQueryContext siddhiQueryContext) {
         ExpressionExecutor[] innerExpressionExecutors;
         if (innerExpressions != null) {
             if (innerExpressions.length > 0) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/InputStreamParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/InputStreamParser.java
index cd7d57d096..2f9a2e501b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/InputStreamParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/InputStreamParser.java
@@ -83,7 +83,7 @@ public static StreamRuntime parse(InputStream inputStream,
                     executors, streamDefinitionMap,
                     tableDefinitionMap, windowDefinitionMap, aggregationDefinitionMap, tableMap,
                     new MetaStreamEvent(), processStreamReceiver, true,
-                    outputExpectsExpiredEvents, siddhiQueryContext);
+                    outputExpectsExpiredEvents, false, siddhiQueryContext);
         } else if (inputStream instanceof JoinInputStream) {
             return JoinInputStreamParser.parseInputStream(((JoinInputStream) inputStream),
                     streamDefinitionMap, tableDefinitionMap, windowDefinitionMap,
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/JoinInputStreamParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/JoinInputStreamParser.java
index ec99867fb9..97111a26b9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/JoinInputStreamParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/JoinInputStreamParser.java
@@ -146,7 +146,7 @@ public static StreamRuntime parseInputStream(JoinInputStream joinInputStream,
                     leftMetaStreamEvent.getEventType() != WINDOW ? null : windowDefinitionMap,
                     leftMetaStreamEvent.getEventType() != AGGREGATE ? null : aggregationDefinitionMap,
                     tableMap, leftMetaStreamEvent, leftProcessStreamReceiver, true,
-                    outputExpectsExpiredEvents, siddhiQueryContext);
+                    outputExpectsExpiredEvents, true, siddhiQueryContext);
 
             for (VariableExpressionExecutor variableExpressionExecutor : executors) {
                 variableExpressionExecutor.getPosition()[SiddhiConstants.STREAM_EVENT_CHAIN_INDEX] = 0;
@@ -160,7 +160,7 @@ public static StreamRuntime parseInputStream(JoinInputStream joinInputStream,
                     rightMetaStreamEvent.getEventType() != WINDOW ? null : windowDefinitionMap,
                     rightMetaStreamEvent.getEventType() != AGGREGATE ? null : aggregationDefinitionMap,
                     tableMap, rightMetaStreamEvent, rightProcessStreamReceiver, true,
-                    outputExpectsExpiredEvents, siddhiQueryContext);
+                    outputExpectsExpiredEvents, true, siddhiQueryContext);
 
             for (int i = size; i < executors.size(); i++) {
                 VariableExpressionExecutor variableExpressionExecutor = executors.get(i);
@@ -298,7 +298,7 @@ private static void setStreamRuntimeProcessorChain(
                 TableWindowProcessor tableWindowProcessor = new TableWindowProcessor(tableMap.get(inputStreamId));
                 tableWindowProcessor.initProcessor(metaStreamEvent,
                         new ExpressionExecutor[0], null, outputExpectsExpiredEvents,
-                        inputStream, siddhiQueryContext);
+                        true, false, inputStream, siddhiQueryContext);
                 streamRuntime.setProcessorChain(tableWindowProcessor);
                 break;
             case WINDOW:
@@ -306,7 +306,7 @@ private static void setStreamRuntimeProcessorChain(
                         windowMap.get(inputStreamId));
                 windowWindowProcessor.initProcessor(metaStreamEvent,
                         variableExpressionExecutors.toArray(new ExpressionExecutor[0]), null,
-                        outputExpectsExpiredEvents, inputStream, siddhiQueryContext);
+                        outputExpectsExpiredEvents, true, false, inputStream, siddhiQueryContext);
                 streamRuntime.setProcessorChain(windowWindowProcessor);
                 break;
             case AGGREGATE:
@@ -316,7 +316,7 @@ private static void setStreamRuntimeProcessorChain(
                         aggregationRuntime, within, per);
                 aggregateWindowProcessor.initProcessor(metaStreamEvent,
                         variableExpressionExecutors.toArray(new ExpressionExecutor[0]), null,
-                        outputExpectsExpiredEvents, inputStream, siddhiQueryContext);
+                        outputExpectsExpiredEvents, true, false, inputStream, siddhiQueryContext);
                 streamRuntime.setProcessorChain(aggregateWindowProcessor);
                 break;
             case DEFAULT:
@@ -351,7 +351,7 @@ private static FindableProcessor insertJoinProcessorsAndGetFindable(JoinProcesso
                 windowProcessor.initProcessor(
                         ((MetaStreamEvent) streamRuntime.getMetaComplexEvent()),
                         expressionExecutors, configReader, outputExpectsExpiredEvents,
-                        inputStream, siddhiQueryContext);
+                        true, false, inputStream, siddhiQueryContext);
                 lastProcessor = windowProcessor;
             } catch (Throwable t) {
                 throw new SiddhiAppCreationException(t);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
index ef2155ad95..a9c2ef2b1a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
@@ -27,8 +27,10 @@
 import io.siddhi.core.exception.SiddhiAppCreationException;
 import io.siddhi.core.query.output.callback.DeleteTableCallback;
 import io.siddhi.core.query.output.callback.InsertIntoStreamCallback;
+import io.siddhi.core.query.output.callback.InsertIntoStreamEndPartitionCallback;
 import io.siddhi.core.query.output.callback.InsertIntoTableCallback;
 import io.siddhi.core.query.output.callback.InsertIntoWindowCallback;
+import io.siddhi.core.query.output.callback.InsertIntoWindowEndPartitionCallback;
 import io.siddhi.core.query.output.callback.OutputCallback;
 import io.siddhi.core.query.output.callback.UpdateOrInsertTableCallback;
 import io.siddhi.core.query.output.callback.UpdateTableCallback;
@@ -113,13 +115,23 @@ public static OutputCallback constructOutputCallback(final OutputStream outStrea
         //Construct CallBack
         if (outStream instanceof InsertIntoStream || outStream instanceof ReturnStream) {
             if (window != null) {
-                return new InsertIntoWindowCallback(window, outputStreamDefinition, siddhiQueryContext.getName());
+                if (!siddhiQueryContext.isPartitioned()) {
+                    return new InsertIntoWindowCallback(window, outputStreamDefinition, siddhiQueryContext.getName());
+                } else {
+                    return new InsertIntoWindowEndPartitionCallback(window, outputStreamDefinition,
+                            siddhiQueryContext.getName());
+                }
             } else if (table != null) {
                 DefinitionParserHelper.validateOutputStream(outputStreamDefinition, table.getTableDefinition());
                 return new InsertIntoTableCallback(table, outputStreamDefinition, convertToStreamEvent,
                         streamEventPool, streamEventConverter, siddhiQueryContext.getName());
             } else {
-                return new InsertIntoStreamCallback(outputStreamDefinition, siddhiQueryContext.getName());
+                if (!siddhiQueryContext.isPartitioned() || outputStreamDefinition.getId().startsWith("#")) {
+                    return new InsertIntoStreamCallback(outputStreamDefinition, siddhiQueryContext.getName());
+                } else {
+                    return new InsertIntoStreamEndPartitionCallback(
+                            outputStreamDefinition, siddhiQueryContext.getName());
+                }
             }
         } else if (outStream instanceof DeleteStream || outStream instanceof UpdateStream || outStream instanceof
                 UpdateOrInsertStream) {
@@ -320,8 +332,8 @@ public static OutputRateLimiter constructOutputRateLimiter(String id, OutputRate
             throw new OperationNotSupportedException(((TimeOutputRate) outputRate).getType() + " not supported in " +
                     "output rate limiting");
         } else {
-            return new WrappedSnapshotOutputRateLimiter(id, ((SnapshotOutputRate) outputRate).getValue(),
-                    scheduledExecutorService, isGroupBy, isWindow, siddhiQueryContext);
+            return new WrappedSnapshotOutputRateLimiter(((SnapshotOutputRate) outputRate).getValue(),
+                    isGroupBy, isWindow, siddhiQueryContext);
         }
 
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/PartitionParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/PartitionParser.java
index 458c49dbb5..10918ac5e7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/PartitionParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/PartitionParser.java
@@ -45,13 +45,13 @@
 public class PartitionParser {
 
     public static PartitionRuntime parse(SiddhiAppRuntimeBuilder siddhiAppRuntimeBuilder, Partition partition,
-                                         SiddhiAppContext siddhiAppContext, int queryIndex) {
+                                         SiddhiAppContext siddhiAppContext, int queryIndex, int partitionIndex) {
         ConcurrentMap<String, AbstractDefinition> streamDefinitionMap =
                 siddhiAppRuntimeBuilder.getStreamDefinitionMap();
         ConcurrentMap<String, AbstractDefinition> windowDefinitionMap =
                 siddhiAppRuntimeBuilder.getWindowDefinitionMap();
         PartitionRuntime partitionRuntime = new PartitionRuntime(streamDefinitionMap, windowDefinitionMap,
-                siddhiAppRuntimeBuilder.getStreamJunctions(), partition, siddhiAppContext);
+                siddhiAppRuntimeBuilder.getStreamJunctions(), partition, partitionIndex, siddhiAppContext);
         validateStreamPartitions(partition.getPartitionTypeMap(), streamDefinitionMap, windowDefinitionMap);
         for (Query query : partition.getQueryList()) {
             List<VariableExpressionExecutor> executors = new ArrayList<VariableExpressionExecutor>();
@@ -68,7 +68,7 @@ public static PartitionRuntime parse(SiddhiAppRuntimeBuilder siddhiAppRuntimeBui
                     siddhiAppRuntimeBuilder.getAggregationMap(),
                     siddhiAppRuntimeBuilder.getWindowMap(),
                     siddhiAppRuntimeBuilder.getLockSynchronizer(),
-                    String.valueOf(queryIndex));
+                    String.valueOf(queryIndex), true);
             queryIndex++;
             MetaStateEvent metaStateEvent = createMetaEventForPartitioner(queryRuntime.getMetaComplexEvent());
             partitionRuntime.addQuery(queryRuntime);
@@ -79,8 +79,8 @@ public static PartitionRuntime parse(SiddhiAppRuntimeBuilder siddhiAppRuntimeBui
             } else {
                 QueryParserHelper.updateVariablePosition(metaStateEvent.getMetaStreamEvent(0), executors);
             }
-            partitionRuntime.init();
         }
+        partitionRuntime.init();
         return partitionRuntime;
 
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/QueryParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/QueryParser.java
index e6a3a4c437..eb2a91f54d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/QueryParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/QueryParser.java
@@ -78,6 +78,7 @@ public class QueryParser {
      * @param windowMap                keyvalue containing event window map.
      * @param lockSynchronizer         Lock synchronizer for sync the lock across queries.
      * @param queryIndex               query index to identify unknown query by number
+     * @param partitioned              is the query partitioned
      * @return queryRuntime
      */
     public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
@@ -88,7 +89,7 @@ public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
                                      Map<String, Table> tableMap,
                                      Map<String, AggregationRuntime> aggregationMap, Map<String, Window> windowMap,
                                      LockSynchronizer lockSynchronizer,
-                                     String queryIndex) {
+                                     String queryIndex, boolean partitioned) {
         List<VariableExpressionExecutor> executors = new ArrayList<VariableExpressionExecutor>();
         QueryRuntime queryRuntime;
         Element nameElement = null;
@@ -104,6 +105,7 @@ public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
                 queryName = "query_" + queryIndex;
             }
             SiddhiQueryContext siddhiQueryContext = new SiddhiQueryContext(siddhiAppContext, queryName);
+            siddhiQueryContext.setPartitioned(partitioned);
             latencyTracker = QueryParserHelper.createLatencyTracker(siddhiAppContext, siddhiQueryContext.getName(),
                     SiddhiConstants.METRIC_INFIX_QUERIES, null);
             siddhiQueryContext.setLatencyTracker(latencyTracker);
@@ -208,12 +210,13 @@ public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
             if (outputRateLimiter instanceof WrappedSnapshotOutputRateLimiter) {
                 selector.setBatchingEnabled(false);
             }
-            siddhiAppContext.addEternalReferencedHolder(outputRateLimiter);
+
+            boolean groupBy = !query.getSelector().getGroupByList().isEmpty();
 
             OutputCallback outputCallback = OutputParser.constructOutputCallback(query.getOutputStream(),
                     streamRuntime.getMetaComplexEvent().getOutputStreamDefinition(), tableMap, windowMap,
                     !(streamRuntime instanceof SingleStreamRuntime) ||
-                            !query.getSelector().getGroupByList().isEmpty(), siddhiQueryContext);
+                            groupBy, siddhiQueryContext);
 
             QueryParserHelper.reduceMetaComplexEvent(streamRuntime.getMetaComplexEvent());
             QueryParserHelper.updateVariablePosition(streamRuntime.getMetaComplexEvent(), executors);
@@ -222,7 +225,7 @@ public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
             selector.setEventPopulator(StateEventPopulatorFactory.constructEventPopulator(streamRuntime
                     .getMetaComplexEvent()));
             queryRuntime = new QueryRuntime(query, streamRuntime, selector, outputRateLimiter, outputCallback,
-                    streamRuntime.getMetaComplexEvent(), lockWrapper != null, siddhiQueryContext);
+                    streamRuntime.getMetaComplexEvent(), siddhiQueryContext);
 
             if (outputRateLimiter instanceof WrappedSnapshotOutputRateLimiter) {
                 selector.setBatchingEnabled(false);
@@ -230,7 +233,7 @@ public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
                         .init(streamRuntime.getMetaComplexEvent().getOutputStreamDefinition().getAttributeList().size(),
                                 selector.getAttributeProcessorList(), streamRuntime.getMetaComplexEvent());
             }
-            outputRateLimiter.init(lockWrapper, siddhiQueryContext);
+            outputRateLimiter.init(lockWrapper, groupBy, siddhiQueryContext);
 
         } catch (DuplicateDefinitionException e) {
             if (nameElement != null) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SchedulerParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SchedulerParser.java
index b6497176fc..0cd3671154 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SchedulerParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SchedulerParser.java
@@ -18,7 +18,7 @@
 
 package io.siddhi.core.util.parser;
 
-import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
 
@@ -35,14 +35,13 @@ private SchedulerParser() {
      * Create Scheduler object.
      *
      * @param singleThreadEntryValve Schedulable
-     * @param siddhiAppContext       SiddhiAppContext
+     * @param siddhiQueryContext     SiddhiAppContext
      * @return Scheduler instance
      */
-    public static Scheduler parse(Schedulable
-                                          singleThreadEntryValve, SiddhiAppContext siddhiAppContext) {
+    public static Scheduler parse(Schedulable singleThreadEntryValve, SiddhiQueryContext siddhiQueryContext) {
 
-        Scheduler scheduler = new Scheduler(singleThreadEntryValve, siddhiAppContext);
-        siddhiAppContext.addScheduler(scheduler);
+        Scheduler scheduler = new Scheduler(singleThreadEntryValve, siddhiQueryContext);
+        siddhiQueryContext.getSiddhiAppContext().addScheduler(scheduler);
         return scheduler;
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SelectorParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SelectorParser.java
index 0797ced26d..031d498768 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SelectorParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SelectorParser.java
@@ -85,13 +85,13 @@ public static QuerySelector parse(Selector selector, OutputStream outputStream,
                 .getOutputEventType() == OutputStream.OutputEventType.ALL_EVENTS) {
             expiredOn = true;
         }
-
+        boolean groupBy = !selector.getGroupByList().isEmpty();
         id = outputStream.getId();
         containsAggregatorThreadLocal.remove();
         QuerySelector querySelector = new QuerySelector(id, selector, currentOn, expiredOn, siddhiQueryContext);
         List<AttributeProcessor> attributeProcessors = getAttributeProcessors(selector, id,
                 metaComplexEvent, tableMap, variableExpressionExecutors, outputStream, metaPosition,
-                processingMode, outputExpectsExpiredEvents, siddhiQueryContext);
+                processingMode, outputExpectsExpiredEvents, groupBy, siddhiQueryContext);
         querySelector.setAttributeProcessorList(attributeProcessors,
                 "true".equals(containsAggregatorThreadLocal.get()));
         containsAggregatorThreadLocal.remove();
@@ -144,8 +144,8 @@ public static QuerySelector parse(Selector selector, OutputStream outputStream,
      * @param outputStream                output stream
      * @param processingMode              processing mode of the query
      * @param outputExpectsExpiredEvents  is expired events sent as output
-     * @param siddhiQueryContext          current siddhi query context
-     * @return list of AttributeProcessors
+     * @param groupBy                     is Attributes groupBy
+     * @param siddhiQueryContext          current siddhi query context  @return list of AttributeProcessors
      */
     private static List<AttributeProcessor> getAttributeProcessors(Selector selector, String id,
                                                                    MetaComplexEvent metaComplexEvent,
@@ -155,7 +155,9 @@ private static List<AttributeProcessor> getAttributeProcessors(Selector selector
                                                                    OutputStream outputStream,
                                                                    int metaPosition,
                                                                    ProcessingMode processingMode,
-                                                                   boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+                                                                   boolean outputExpectsExpiredEvents,
+                                                                   boolean groupBy,
+                                                                   SiddhiQueryContext siddhiQueryContext) {
 
         List<AttributeProcessor> attributeProcessorList = new ArrayList<>();
         StreamDefinition outputDefinition = StreamDefinition.id(id);
@@ -201,7 +203,7 @@ private static List<AttributeProcessor> getAttributeProcessors(Selector selector
 
             ExpressionExecutor expressionExecutor = ExpressionParser.parseExpression(outputAttribute.getExpression(),
                     metaComplexEvent, SiddhiConstants.UNKNOWN_STATE, tableMap, variableExpressionExecutors,
-                    !(selector.getGroupByList().isEmpty()), 0, processingMode,
+                    groupBy, 0, processingMode,
                     outputExpectsExpiredEvents, siddhiQueryContext);
             if (expressionExecutor instanceof VariableExpressionExecutor) {   //for variables we will directly put
                 // value at conversion stage
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SiddhiAppParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SiddhiAppParser.java
index c0637bed1b..4e28a2bcbe 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SiddhiAppParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SiddhiAppParser.java
@@ -24,8 +24,8 @@
 import io.siddhi.core.partition.PartitionRuntime;
 import io.siddhi.core.query.QueryRuntime;
 import io.siddhi.core.stream.StreamJunction;
-import io.siddhi.core.util.ElementIdGenerator;
 import io.siddhi.core.util.ExceptionUtil;
+import io.siddhi.core.util.IdGenerator;
 import io.siddhi.core.util.SiddhiAppRuntimeBuilder;
 import io.siddhi.core.util.SiddhiConstants;
 import io.siddhi.core.util.ThreadBarrier;
@@ -48,6 +48,11 @@
 import io.siddhi.query.api.execution.ExecutionElement;
 import io.siddhi.query.api.execution.partition.Partition;
 import io.siddhi.query.api.execution.query.Query;
+import io.siddhi.query.api.execution.query.input.handler.StreamHandler;
+import io.siddhi.query.api.execution.query.input.stream.JoinInputStream;
+import io.siddhi.query.api.execution.query.input.stream.SingleInputStream;
+import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
+import io.siddhi.query.api.expression.condition.In;
 import io.siddhi.query.api.util.AnnotationHelper;
 import io.siddhi.query.compiler.SiddhiCompiler;
 import io.siddhi.query.compiler.exception.SiddhiParserException;
@@ -210,7 +215,7 @@ public static SiddhiAppRuntimeBuilder parse(SiddhiApp siddhiApp, String siddhiAp
                 siddhiAppContext.setTimestampGenerator(new TimestampGeneratorImpl(siddhiAppContext));
             }
             siddhiAppContext.setSnapshotService(new SnapshotService(siddhiAppContext));
-            siddhiAppContext.setElementIdGenerator(new ElementIdGenerator(siddhiAppContext.getName()));
+            siddhiAppContext.setIdGenerator(new IdGenerator());
 
         } catch (DuplicateAnnotationException e) {
             throw new DuplicateAnnotationException(e.getMessageWithOutContext() + " for the same Siddhi app " +
@@ -226,16 +231,21 @@ public static SiddhiAppRuntimeBuilder parse(SiddhiApp siddhiApp, String siddhiAp
         defineFunctionDefinitions(siddhiAppRuntimeBuilder, siddhiApp.getFunctionDefinitionMap(), siddhiAppContext);
         defineAggregationDefinitions(siddhiAppRuntimeBuilder, siddhiApp.getAggregationDefinitionMap(),
                 siddhiAppContext);
+        //todo fix for query API usecase
+        List<String> findExecutedElements = getFindExecutedElements(siddhiApp);
         for (Window window : siddhiAppRuntimeBuilder.getWindowMap().values()) {
+
             try {
-                window.init(siddhiAppRuntimeBuilder.getTableMap(), siddhiAppRuntimeBuilder
-                        .getWindowMap(), window.getWindowDefinition().getId());
+                window.init(siddhiAppRuntimeBuilder.getTableMap(), siddhiAppRuntimeBuilder.getWindowMap(),
+                        window.getWindowDefinition().getId(),
+                        findExecutedElements.contains(window.getWindowDefinition().getId()));
             } catch (Throwable t) {
                 ExceptionUtil.populateQueryContext(t, window.getWindowDefinition(), siddhiAppContext);
                 throw t;
             }
         }
         int queryIndex = 1;
+        int partitionIndex = 1;
         for (ExecutionElement executionElement : siddhiApp.getExecutionElementList()) {
             if (executionElement instanceof Query) {
                 try {
@@ -248,8 +258,9 @@ public static SiddhiAppRuntimeBuilder parse(SiddhiApp siddhiApp, String siddhiAp
                             siddhiAppRuntimeBuilder.getAggregationMap(),
                             siddhiAppRuntimeBuilder.getWindowMap(),
                             siddhiAppRuntimeBuilder.getLockSynchronizer(),
-                            String.valueOf(queryIndex));
+                            String.valueOf(queryIndex), false);
                     siddhiAppRuntimeBuilder.addQuery(queryRuntime);
+                    siddhiAppContext.addEternalReferencedHolder(queryRuntime);
                     queryIndex++;
                 } catch (Throwable t) {
                     ExceptionUtil.populateQueryContext(t, (Query) executionElement, siddhiAppContext);
@@ -258,9 +269,10 @@ public static SiddhiAppRuntimeBuilder parse(SiddhiApp siddhiApp, String siddhiAp
             } else {
                 try {
                     PartitionRuntime partitionRuntime = PartitionParser.parse(siddhiAppRuntimeBuilder,
-                            (Partition) executionElement, siddhiAppContext, queryIndex);
+                            (Partition) executionElement, siddhiAppContext, queryIndex, partitionIndex);
                     siddhiAppRuntimeBuilder.addPartition(partitionRuntime);
                     queryIndex += ((Partition) executionElement).getQueryList().size();
+                    partitionIndex++;
                 } catch (Throwable t) {
                     ExceptionUtil.populateQueryContext(t, (Partition) executionElement, siddhiAppContext);
                     throw t;
@@ -272,6 +284,50 @@ public static SiddhiAppRuntimeBuilder parse(SiddhiApp siddhiApp, String siddhiAp
         return siddhiAppRuntimeBuilder;
     }
 
+    private static List<String> getFindExecutedElements(SiddhiApp siddhiApp) {
+        List<String> findExecutedElements = new ArrayList<>();
+        for (ExecutionElement executionElement : siddhiApp.getExecutionElementList()) {
+            if (executionElement instanceof Query) {
+                List<StreamHandler> streamHandlers = new ArrayList<>();
+                if (((Query) executionElement).getInputStream() instanceof JoinInputStream) {
+                    findExecutedElements.addAll(((Query) executionElement).getInputStream().getAllStreamIds());
+                    streamHandlers.addAll(((SingleInputStream) ((JoinInputStream) ((Query) executionElement).getInputStream()).getLeftInputStream()).getStreamHandlers());
+                    streamHandlers.addAll(((SingleInputStream) ((JoinInputStream) ((Query) executionElement).getInputStream()).getRightInputStream()).getStreamHandlers());
+                } else if (((Query) executionElement).getInputStream() instanceof SingleInputStream) {
+                    streamHandlers.addAll(((SingleInputStream) ((Query) executionElement).getInputStream()).getStreamHandlers());
+                } else if (((Query) executionElement).getInputStream() instanceof StateInputStream) {
+                    streamHandlers.addAll((((StateInputStream) ((Query) executionElement).getInputStream()).getStreamHandlers()));
+                }
+                for (StreamHandler streamHandler : streamHandlers) {
+                    if (streamHandler instanceof In) {
+                        findExecutedElements.add(((In) streamHandler).getSourceId());
+                    }
+                }
+            } else {
+                List<Query> queries = ((Partition) executionElement).getQueryList();
+                for (Query query : queries) {
+                    List<StreamHandler> streamHandlers = new ArrayList<>();
+                    if (query.getInputStream() instanceof JoinInputStream) {
+                        findExecutedElements.addAll(query.getInputStream().getAllStreamIds());
+                        streamHandlers.addAll(((SingleInputStream) ((JoinInputStream) query.getInputStream()).getLeftInputStream()).getStreamHandlers());
+                        streamHandlers.addAll(((SingleInputStream) ((JoinInputStream) query.getInputStream()).getRightInputStream()).getStreamHandlers());
+                    } else if (query.getInputStream() instanceof SingleInputStream) {
+                        streamHandlers.addAll(((SingleInputStream) query.getInputStream()).getStreamHandlers());
+                    } else if (query.getInputStream() instanceof StateInputStream) {
+                        streamHandlers.addAll((((StateInputStream) query.getInputStream()).getStreamHandlers()));
+                    }
+                    for (StreamHandler streamHandler : streamHandlers) {
+                        if (streamHandler instanceof In) {
+                            findExecutedElements.add(((In) streamHandler).getSourceId());
+                        }
+                    }
+                }
+            }
+
+        }
+        return findExecutedElements;
+    }
+
     private static void defineTriggerDefinitions(SiddhiAppRuntimeBuilder siddhiAppRuntimeBuilder,
                                                  Map<String, TriggerDefinition> triggerDefinitionMap,
                                                  SiddhiAppContext siddhiAppContext) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SingleInputStreamParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SingleInputStreamParser.java
index a9c318c46c..528f40d943 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SingleInputStreamParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SingleInputStreamParser.java
@@ -75,6 +75,7 @@ public class SingleInputStreamParser {
      * @param processStreamReceiver       ProcessStreamReceiver
      * @param supportsBatchProcessing     supports batch processing
      * @param outputExpectsExpiredEvents  is expired events sent as output
+     * @param findToBeExecuted            find will be executed in the steam stores
      * @param siddhiQueryContext          @return SingleStreamRuntime
      */
     public static SingleStreamRuntime parseInputStream(SingleInputStream inputStream,
@@ -88,6 +89,7 @@ public static SingleStreamRuntime parseInputStream(SingleInputStream inputStream
                                                        ProcessStreamReceiver processStreamReceiver,
                                                        boolean supportsBatchProcessing,
                                                        boolean outputExpectsExpiredEvents,
+                                                       boolean findToBeExecuted,
                                                        SiddhiQueryContext siddhiQueryContext) {
         Processor processor = null;
         EntryValveProcessor entryValveProcessor = null;
@@ -120,7 +122,7 @@ public static SingleStreamRuntime parseInputStream(SingleInputStream inputStream
             for (StreamHandler handler : inputStream.getStreamHandlers()) {
                 Processor currentProcessor = generateProcessor(handler, metaComplexEvent,
                         variableExpressionExecutors, tableMap, supportsBatchProcessing,
-                        outputExpectsExpiredEvents, siddhiQueryContext);
+                        outputExpectsExpiredEvents, findToBeExecuted, siddhiQueryContext);
                 if (currentProcessor instanceof SchedulingProcessor) {
                     if (entryValveProcessor == null) {
 
@@ -132,8 +134,7 @@ public static SingleStreamRuntime parseInputStream(SingleInputStream inputStream
                             processor.setToLast(entryValveProcessor);
                         }
                     }
-                    Scheduler scheduler = SchedulerParser.parse(entryValveProcessor,
-                            siddhiQueryContext.getSiddhiAppContext());
+                    Scheduler scheduler = SchedulerParser.parse(entryValveProcessor, siddhiQueryContext);
                     ((SchedulingProcessor) currentProcessor).setScheduler(scheduler);
                 }
                 if (currentProcessor instanceof AbstractStreamProcessor) {
@@ -158,7 +159,8 @@ public static SingleStreamRuntime parseInputStream(SingleInputStream inputStream
     public static Processor generateProcessor(StreamHandler streamHandler, MetaComplexEvent metaEvent,
                                               List<VariableExpressionExecutor> variableExpressionExecutors,
                                               Map<String, Table> tableMap,
-                                              boolean supportsBatchProcessing, boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+                                              boolean supportsBatchProcessing, boolean outputExpectsExpiredEvents,
+                                              boolean findToBeExecuted, SiddhiQueryContext siddhiQueryContext) {
         Expression[] parameters = streamHandler.getParameters();
         MetaStreamEvent metaStreamEvent;
         int stateIndex = SiddhiConstants.UNKNOWN_STATE;
@@ -206,7 +208,7 @@ public static Processor generateProcessor(StreamHandler streamHandler, MetaCompl
                     generateConfigReader(((Window) streamHandler).getNamespace(),
                             ((Window) streamHandler).getName());
             windowProcessor.initProcessor(metaStreamEvent, attributeExpressionExecutors,
-                    configReader, outputExpectsExpiredEvents, streamHandler, siddhiQueryContext);
+                    configReader, outputExpectsExpiredEvents, findToBeExecuted, false, streamHandler, siddhiQueryContext);
             return windowProcessor;
 
         } else if (streamHandler instanceof StreamFunction) {
@@ -221,7 +223,7 @@ public static Processor generateProcessor(StreamHandler streamHandler, MetaCompl
                             StreamProcessorExtensionHolder.getInstance(siddhiQueryContext.getSiddhiAppContext()));
                     abstractStreamProcessor.initProcessor(metaStreamEvent,
                             attributeExpressionExecutors, configReader,
-                            outputExpectsExpiredEvents, streamHandler, siddhiQueryContext);
+                            outputExpectsExpiredEvents, false, false, streamHandler, siddhiQueryContext);
                     return abstractStreamProcessor;
                 } catch (SiddhiAppCreationException e) {
                     if (!e.isClassLoadingIssue()) {
@@ -234,7 +236,7 @@ public static Processor generateProcessor(StreamHandler streamHandler, MetaCompl
                     (Extension) streamHandler,
                     StreamFunctionProcessorExtensionHolder.getInstance(siddhiQueryContext.getSiddhiAppContext()));
             abstractStreamProcessor.initProcessor(metaStreamEvent, attributeExpressionExecutors,
-                    configReader, outputExpectsExpiredEvents, streamHandler, siddhiQueryContext);
+                    configReader, outputExpectsExpiredEvents, false, false, streamHandler, siddhiQueryContext);
             return abstractStreamProcessor;
         } else {
             throw new SiddhiAppCreationException(streamHandler.getClass().getName() + " is not supported",
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StateInputStreamParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StateInputStreamParser.java
index af05aef372..0088d6d0ab 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StateInputStreamParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StateInputStreamParser.java
@@ -112,14 +112,16 @@ public static StateStreamRuntime parseInputStream(StateInputStream stateInputStr
 
         StateElement stateElement = stateInputStream.getStateElement();
         List<PreStateProcessor> preStateProcessors = new ArrayList<>();
+        List<PreStateProcessor> startupPreStateProcessors = new ArrayList<>();
         InnerStateRuntime innerStateRuntime = parse(stateElement, streamDefinitionMap, tableDefinitionMap,
                 windowDefinitionMap, aggregationDefinitionMap, tableMap, metaStateEvent,
                 variableExpressionExecutors, processStreamReceiverMap,
                 null, null,
                 stateInputStream.getStateType(),
-                preStateProcessors, true, siddhiQueryContext);
+                preStateProcessors, true, startupPreStateProcessors, siddhiQueryContext);
 
         stateStreamRuntime.setInnerStateRuntime(innerStateRuntime);
+        stateStreamRuntime.setStartupPreStateProcessors(startupPreStateProcessors);
 
         if (stateInputStream.getWithinTime() != null) {
             List<Integer> startStateIdList = new ArrayList<>();
@@ -153,7 +155,9 @@ private static InnerStateRuntime parse(StateElement stateElement,
                                            StreamPostStateProcessor streamPostStateProcessor,
                                            StateInputStream.Type stateType,
                                            List<PreStateProcessor> preStateProcessors,
-                                           boolean isStartState, SiddhiQueryContext siddhiQueryContext) {
+                                           boolean isStartState,
+                                           List<PreStateProcessor> startupPreStateProcessors,
+                                           SiddhiQueryContext siddhiQueryContext) {
 
 
         if (stateElement instanceof StreamStateElement) {
@@ -164,7 +168,7 @@ private static InnerStateRuntime parse(StateElement stateElement,
                     basicSingleInputStream, variableExpressionExecutors, streamDefinitionMap,
                     tableDefinitionMap, windowDefinitionMap, aggregationDefinitionMap, tableMap, metaStateEvent,
                     processStreamReceiverMap.get(basicSingleInputStream.getUniqueStreamIds().get(0)),
-                    false, false, siddhiQueryContext);
+                    false, false, false, siddhiQueryContext);
 
             int stateIndex = metaStateEvent.getStreamEventCount() - 1;
             if (streamPreStateProcessor == null) {
@@ -175,13 +179,12 @@ private static InnerStateRuntime parse(StateElement stateElement,
                             ((AbsentStreamStateElement) stateElement).getWaitingTime().value());
 
                     // Set the scheduler
-                    siddhiQueryContext.getSiddhiAppContext().addEternalReferencedHolder(absentProcessor);
+                    startupPreStateProcessors.add(absentProcessor);
                     EntryValveProcessor entryValveProcessor = new EntryValveProcessor(
                             siddhiQueryContext.getSiddhiAppContext());
                     entryValveProcessor.setToLast(absentProcessor);
                     Scheduler scheduler = SchedulerParser.parse(
-                            entryValveProcessor,
-                            siddhiQueryContext.getSiddhiAppContext());
+                            entryValveProcessor, siddhiQueryContext);
                     absentProcessor.setScheduler(scheduler);
 
                     // Assign the AbsentStreamPreStateProcessor to streamPreStateProcessor
@@ -224,14 +227,14 @@ private static InnerStateRuntime parse(StateElement stateElement,
                     variableExpressionExecutors,
                     processStreamReceiverMap,
                     streamPreStateProcessor, streamPostStateProcessor,
-                    stateType, preStateProcessors, isStartState, siddhiQueryContext);
+                    stateType, preStateProcessors, isStartState, startupPreStateProcessors, siddhiQueryContext);
 
             StateElement nextElement = ((NextStateElement) stateElement).getNextStateElement();
             InnerStateRuntime nextInnerStateRuntime = parse(nextElement, streamDefinitionMap, tableDefinitionMap,
                     windowDefinitionMap, aggregationDefinitionMap, tableMap, metaStateEvent,
                     variableExpressionExecutors, processStreamReceiverMap,
                     streamPreStateProcessor, streamPostStateProcessor, stateType, preStateProcessors,
-                    false, siddhiQueryContext);
+                    false, startupPreStateProcessors, siddhiQueryContext);
 
             currentInnerStateRuntime.getLastProcessor().setNextStatePreProcessor(nextInnerStateRuntime
                     .getFirstProcessor());
@@ -259,7 +262,7 @@ private static InnerStateRuntime parse(StateElement stateElement,
                     windowDefinitionMap, aggregationDefinitionMap, tableMap, metaStateEvent,
                     variableExpressionExecutors, processStreamReceiverMap,
                     streamPreStateProcessor, streamPostStateProcessor, stateType,
-                    withinEveryPreStateProcessors, isStartState, siddhiQueryContext);
+                    withinEveryPreStateProcessors, isStartState, startupPreStateProcessors, siddhiQueryContext);
 
             EveryInnerStateRuntime everyInnerStateRuntime = new EveryInnerStateRuntime(innerStateRuntime, stateType);
 
@@ -289,14 +292,12 @@ private static InnerStateRuntime parse(StateElement stateElement,
                                 .getStreamStateElement1()).getWaitingTime());
 
                 // Set the scheduler
-                siddhiQueryContext.getSiddhiAppContext().addEternalReferencedHolder((AbsentLogicalPreStateProcessor)
-                        logicalPreStateProcessor1);
+                startupPreStateProcessors.add(logicalPreStateProcessor1);
                 EntryValveProcessor entryValveProcessor = new EntryValveProcessor(
                         siddhiQueryContext.getSiddhiAppContext());
                 entryValveProcessor.setToLast(logicalPreStateProcessor1);
                 Scheduler scheduler = SchedulerParser.parse(
-                        entryValveProcessor,
-                        siddhiQueryContext.getSiddhiAppContext());
+                        entryValveProcessor, siddhiQueryContext);
                 ((SchedulingProcessor) logicalPreStateProcessor1).setScheduler(scheduler);
             } else {
                 logicalPreStateProcessor1 = new LogicalPreStateProcessor(type, stateType);
@@ -314,13 +315,11 @@ private static InnerStateRuntime parse(StateElement stateElement,
                 logicalPreStateProcessor2 = new AbsentLogicalPreStateProcessor(type, stateType,
                         ((AbsentStreamStateElement) ((LogicalStateElement) stateElement).getStreamStateElement2())
                                 .getWaitingTime());
-                siddhiQueryContext.getSiddhiAppContext().addEternalReferencedHolder((AbsentLogicalPreStateProcessor)
-                        logicalPreStateProcessor2);
+                startupPreStateProcessors.add(logicalPreStateProcessor2);
                 EntryValveProcessor entryValveProcessor = new EntryValveProcessor(
                         siddhiQueryContext.getSiddhiAppContext());
                 entryValveProcessor.setToLast(logicalPreStateProcessor2);
-                Scheduler scheduler = SchedulerParser.parse(entryValveProcessor,
-                        siddhiQueryContext.getSiddhiAppContext());
+                Scheduler scheduler = SchedulerParser.parse(entryValveProcessor, siddhiQueryContext);
                 ((SchedulingProcessor) logicalPreStateProcessor2).setScheduler(scheduler);
             } else {
                 logicalPreStateProcessor2 = new LogicalPreStateProcessor(type, stateType);
@@ -347,14 +346,14 @@ private static InnerStateRuntime parse(StateElement stateElement,
                     windowDefinitionMap, aggregationDefinitionMap, tableMap, metaStateEvent,
                     variableExpressionExecutors, processStreamReceiverMap,
                     logicalPreStateProcessor2, logicalPostStateProcessor2,
-                    stateType, preStateProcessors, isStartState, siddhiQueryContext);
+                    stateType, preStateProcessors, isStartState, startupPreStateProcessors, siddhiQueryContext);
 
             StateElement stateElement1 = ((LogicalStateElement) stateElement).getStreamStateElement1();
             InnerStateRuntime innerStateRuntime1 = parse(stateElement1, streamDefinitionMap, tableDefinitionMap,
                     windowDefinitionMap, aggregationDefinitionMap, tableMap, metaStateEvent,
                     variableExpressionExecutors, processStreamReceiverMap,
                     logicalPreStateProcessor1, logicalPostStateProcessor1, stateType,
-                    preStateProcessors, isStartState, siddhiQueryContext);
+                    preStateProcessors, isStartState, startupPreStateProcessors, siddhiQueryContext);
 
 
             LogicalInnerStateRuntime logicalInnerStateRuntime = new LogicalInnerStateRuntime(
@@ -394,7 +393,7 @@ private static InnerStateRuntime parse(StateElement stateElement,
                     windowDefinitionMap, aggregationDefinitionMap, tableMap, metaStateEvent,
                     variableExpressionExecutors, processStreamReceiverMap,
                     countPreStateProcessor, countPostStateProcessor, stateType,
-                    preStateProcessors, isStartState, siddhiQueryContext);
+                    preStateProcessors, isStartState, startupPreStateProcessors, siddhiQueryContext);
 
             return new CountInnerStateRuntime((StreamInnerStateRuntime) innerStateRuntime);
         } else {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StoreQueryParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StoreQueryParser.java
index aab28804a9..f6004bf1eb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StoreQueryParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StoreQueryParser.java
@@ -109,7 +109,7 @@ public static StoreQueryRuntime parse(StoreQuery storeQuery, SiddhiAppContext si
         SiddhiQueryContext siddhiQueryContext;
         Expression onCondition;
 
-        SnapshotService.getSkipSnapshotableThreadLocal().set(true);
+        SnapshotService.getSkipStateStorageThreadLocal().set(true);
 
         switch (storeQuery.getType()) {
             case FIND:
@@ -149,7 +149,8 @@ public static StoreQueryRuntime parse(StoreQuery storeQuery, SiddhiAppContext si
                     table = tableMap.get(inputStore.getStoreId());
                     if (table != null) {
                         return constructStoreQueryRuntime(table, storeQuery, tableMap, windowMap,
-                                metaPosition, onCondition, metaStreamEvent, variableExpressionExecutors, lockWrapper, siddhiQueryContext);
+                                metaPosition, onCondition, metaStreamEvent, variableExpressionExecutors, lockWrapper,
+                                siddhiQueryContext);
                     } else {
                         AggregationRuntime aggregation = aggregationMap.get(inputStore.getStoreId());
                         if (aggregation != null) {
@@ -170,7 +171,7 @@ public static StoreQueryRuntime parse(StoreQuery storeQuery, SiddhiAppContext si
                     }
 
                 } finally {
-                    SnapshotService.getSkipSnapshotableThreadLocal().set(null);
+                    SnapshotService.getSkipStateStorageThreadLocal().set(null);
                 }
             case INSERT:
                 InsertIntoStream inserIntoStreamt = (InsertIntoStream) storeQuery.getOutputStream();
@@ -228,7 +229,7 @@ private static StoreQueryRuntime getStoreQueryRuntime(StoreQuery storeQuery,
             }
 
         } finally {
-            SnapshotService.getSkipSnapshotableThreadLocal().set(null);
+            SnapshotService.getSkipStateStorageThreadLocal().set(null);
         }
     }
 
@@ -248,7 +249,8 @@ private static StoreQueryRuntime constructStoreQueryRuntime(
         FindStoreQueryRuntime findStoreQueryRuntime = new FindStoreQueryRuntime(window, compiledCondition,
                 siddhiQueryContext.getName(), metaStreamEvent);
         populateFindStoreQueryRuntime(findStoreQueryRuntime, metaStreamInfoHolder, storeQuery.getSelector(),
-                variableExpressionExecutors, tableMap, windowMap, metaPosition, lockWrapper, siddhiQueryContext);
+                variableExpressionExecutors, tableMap, windowMap, metaPosition,
+                !storeQuery.getSelector().getGroupByList().isEmpty(), lockWrapper, siddhiQueryContext);
         return findStoreQueryRuntime;
     }
 
@@ -272,11 +274,11 @@ private static StoreQueryRuntime constructStoreQueryRuntime(AggregationRuntime a
         metaStreamInfoHolder = ((IncrementalAggregateCompileCondition) compiledCondition).
                 getAlteredMatchingMetaInfoHolder();
         FindStoreQueryRuntime findStoreQueryRuntime = new FindStoreQueryRuntime(aggregation, compiledCondition,
-                siddhiQueryContext.getName(), metaStreamEvent);
+                siddhiQueryContext.getName(), metaStreamEvent, siddhiQueryContext);
         metaPosition = 1;
         populateFindStoreQueryRuntime(findStoreQueryRuntime, metaStreamInfoHolder,
                 storeQuery.getSelector(), variableExpressionExecutors, tableMap, windowMap,
-                metaPosition, lockWrapper, siddhiQueryContext);
+                metaPosition, !storeQuery.getSelector().getGroupByList().isEmpty(), lockWrapper, siddhiQueryContext);
         ComplexEventPopulater complexEventPopulater = StreamEventPopulaterFactory.constructEventPopulator(
                 metaStreamInfoHolder.getMetaStateEvent().getMetaStreamEvent(0), 0,
                 ((IncrementalAggregateCompileCondition) compiledCondition).getAdditionalAttributes());
@@ -378,7 +380,8 @@ private static StoreQueryRuntime constructRegularStoreQueryRuntime(Table table,
                         siddhiQueryContext.getName(), metaStreamEvent);
                 populateFindStoreQueryRuntime(findStoreQueryRuntime, matchingMetaInfoHolder,
                         storeQuery.getSelector(), variableExpressionExecutors,
-                        tableMap, windowMap, metaPosition, lockWrapper, siddhiQueryContext);
+                        tableMap, windowMap, metaPosition,  !storeQuery.getSelector().getGroupByList().isEmpty(),
+                        lockWrapper, siddhiQueryContext);
                 return findStoreQueryRuntime;
             case INSERT:
                 initMetaStreamEvent(metaStreamEvent, getInputDefinition(storeQuery, table));
@@ -464,14 +467,14 @@ private static void populateFindStoreQueryRuntime(FindStoreQueryRuntime findStor
                                                       MatchingMetaInfoHolder metaStreamInfoHolder, Selector selector,
                                                       List<VariableExpressionExecutor> variableExpressionExecutors,
                                                       Map<String, Table> tableMap, Map<String, Window> windowMap,
-                                                      int metaPosition, LockWrapper lockWrapper,
+                                                      int metaPosition, boolean groupBy, LockWrapper lockWrapper,
                                                       SiddhiQueryContext siddhiQueryContext) {
         ReturnStream returnStream = new ReturnStream(OutputStream.OutputEventType.CURRENT_EVENTS);
         QuerySelector querySelector = SelectorParser.parse(selector, returnStream,
                 metaStreamInfoHolder.getMetaStateEvent(), tableMap, variableExpressionExecutors,
                 metaPosition, ProcessingMode.BATCH, false, siddhiQueryContext);
         PassThroughOutputRateLimiter rateLimiter = new PassThroughOutputRateLimiter(siddhiQueryContext.getName());
-        rateLimiter.init(lockWrapper, siddhiQueryContext);
+        rateLimiter.init(lockWrapper, groupBy, siddhiQueryContext);
         OutputCallback outputCallback = OutputParser.constructOutputCallback(returnStream,
                 metaStreamInfoHolder.getMetaStateEvent().getOutputStreamDefinition(), tableMap, windowMap,
                 true, siddhiQueryContext);
@@ -499,7 +502,7 @@ private static QuerySelector getQuerySelector(MatchingMetaInfoHolder matchingMet
                 ProcessingMode.BATCH, false, siddhiQueryContext);
 
         PassThroughOutputRateLimiter rateLimiter = new PassThroughOutputRateLimiter(siddhiQueryContext.getName());
-        rateLimiter.init(lockWrapper, siddhiQueryContext);
+        rateLimiter.init(lockWrapper,  !storeQuery.getSelector().getGroupByList().isEmpty(), siddhiQueryContext);
         OutputCallback outputCallback = OutputParser.constructOutputCallback(storeQuery.getOutputStream(),
                 matchingMetaInfoHolder.getMetaStateEvent().getOutputStreamDefinition(), tableMap, windowMap,
                 true, siddhiQueryContext);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/DefinitionParserHelper.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/DefinitionParserHelper.java
index a0bbb92284..8950915508 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/DefinitionParserHelper.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/DefinitionParserHelper.java
@@ -212,7 +212,7 @@ public String getName() {
             table.initTable(tableDefinition, tableStreamEventPool, tableStreamEventCloner, configReader,
                     siddhiAppContext, recordTableHandler);
             if (recordTableHandler != null) {
-                recordTableHandlerManager.registerRecordTableHandler(recordTableHandler.getElementId(),
+                recordTableHandlerManager.registerRecordTableHandler(recordTableHandler.getId(),
                         recordTableHandler);
             }
             tableMap.putIfAbsent(tableDefinition.getId(), table);
@@ -372,10 +372,8 @@ public static void addEventSource(StreamDefinition streamDefinition,
                     ExceptionUtil.populateQueryContext(t, sourceAnnotation, siddhiAppContext);
                     throw t;
                 }
-                siddhiAppContext.getSnapshotService().addSnapshotable(source.getStreamDefinition().getId(), source);
                 if (sourceHandlerManager != null) {
-                    sourceHandlerManager.registerSourceHandler(sourceHandler.getElementId(), sourceHandler);
-                    siddhiAppContext.getSnapshotService().addSnapshotable(streamDefinition.getId(), sourceHandler);
+                    sourceHandlerManager.registerSourceHandler(sourceHandler.getId(), sourceHandler);
                 }
                 List<Source> eventSources = eventSourceMap.get(streamDefinition.getId());
                 if (eventSources == null) {
@@ -553,9 +551,7 @@ public static void addEventSink(StreamDefinition streamDefinition,
                         }
 
                         if (sinkHandlerManager != null) {
-                            sinkHandlerManager.registerSinkHandler(sinkHandler.getElementId(), sinkHandler);
-                            siddhiAppContext.getSnapshotService().addSnapshotable(streamDefinition.getId(),
-                                    sinkHandler);
+                            sinkHandlerManager.registerSinkHandler(sinkHandler.getId(), sinkHandler);
                         }
 
                         validateSinkMapperCompatibility(streamDefinition, sinkType, mapType, sink, sinkMapper,
@@ -568,8 +564,6 @@ public static void addEventSink(StreamDefinition streamDefinition,
                             sink.getMapper().setGroupDeterminer(groupDeterminer);
                         }
 
-                        siddhiAppContext.getSnapshotService().addSnapshotable(sink.getStreamDefinition().getId(), sink);
-
                         List<Sink> eventSinks = eventSinkMap.get(streamDefinition.getId());
                         if (eventSinks == null) {
                             eventSinks = new ArrayList<>();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/IncrementalFileSystemPersistenceStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/IncrementalFileSystemPersistenceStore.java
index 7a00c40b21..85e591cda5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/IncrementalFileSystemPersistenceStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/IncrementalFileSystemPersistenceStore.java
@@ -101,7 +101,7 @@ public List<IncrementalSnapshotInfo> getListOfRevisionsToLoad(long restoreTime,
             IncrementalSnapshotInfo snapshotInfo = PersistenceHelper.convertRevision(fileName);
             if (snapshotInfo.getTime() <= restoreTime &&
                     siddhiAppName.equals(snapshotInfo.getSiddhiAppId()) &&
-                    snapshotInfo.getElementId() != null &&
+                    snapshotInfo.getId() != null &&
                     snapshotInfo.getQueryName() != null) {
                 //Note: Here we discard the (items.length == 2) scenario which is handled
                 // by the full snapshot handling
@@ -127,7 +127,7 @@ public String getLastRevision(String siddhiAppName) {
             IncrementalSnapshotInfo snapshotInfo = PersistenceHelper.convertRevision(fileName);
             if (snapshotInfo.getTime() > restoreTime &&
                     siddhiAppName.equals(snapshotInfo.getSiddhiAppId()) &&
-                    snapshotInfo.getElementId() != null &&
+                    snapshotInfo.getId() != null &&
                     snapshotInfo.getQueryName() != null) {
                 //Note: Here we discard the (items.length == 2) scenario which is handled
                 // by the full snapshot handling
@@ -177,7 +177,7 @@ private void cleanOldRevisions(IncrementalSnapshotInfo incrementalSnapshotInfo)
                     if (snapshotInfo.getTime() < baseTimeStamp &&
                             incrementalSnapshotInfo.getSiddhiAppId().equals(snapshotInfo.getSiddhiAppId()) &&
                             incrementalSnapshotInfo.getQueryName().equals(snapshotInfo.getQueryName()) &&
-                            incrementalSnapshotInfo.getElementId().equals(snapshotInfo.getElementId())) {
+                            incrementalSnapshotInfo.getId().equals(snapshotInfo.getId())) {
                         if (incrementalSnapshotInfo.getType() == IncrementalSnapshotInfo.SnapshotType.BASE &&
                                 snapshotInfo.getType() != IncrementalSnapshotInfo.SnapshotType.PERIODIC) {
                             if (file.exists()) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/IncrementalSnapshotInfo.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/IncrementalSnapshotInfo.java
index 79ea2b2536..e4c827921a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/IncrementalSnapshotInfo.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/IncrementalSnapshotInfo.java
@@ -23,21 +23,33 @@
  */
 public class IncrementalSnapshotInfo {
 
+    private String id;
     private String siddhiAppId;
+    private String partitionId;
+    private String partitionKey;
     private String queryName;
     private String elementId;
     private long time;
     private String revision;
     private SnapshotType type;
 
-    public IncrementalSnapshotInfo(String siddhiAppId, String queryName, String elementId, long time,
-                                   SnapshotType type) {
+    public IncrementalSnapshotInfo(String siddhiAppId, String partitionId, String queryName, String elementId,
+                                   long time, SnapshotType type, String partitionKey) {
         this.siddhiAppId = siddhiAppId;
+        this.partitionId = partitionId;
         this.queryName = queryName;
         this.elementId = elementId;
         this.time = time;
         this.type = type;
+        this.partitionKey = partitionKey;
+        this.id = siddhiAppId +
+                PersistenceConstants.REVISION_SEPARATOR + partitionId +
+                PersistenceConstants.REVISION_SEPARATOR + partitionKey +
+                PersistenceConstants.REVISION_SEPARATOR + queryName +
+                PersistenceConstants.REVISION_SEPARATOR + elementId;
         this.revision = time + PersistenceConstants.REVISION_SEPARATOR + siddhiAppId +
+                PersistenceConstants.REVISION_SEPARATOR + partitionId +
+                PersistenceConstants.REVISION_SEPARATOR + partitionKey +
                 PersistenceConstants.REVISION_SEPARATOR + queryName +
                 PersistenceConstants.REVISION_SEPARATOR + elementId +
                 PersistenceConstants.REVISION_SEPARATOR + type;
@@ -87,6 +99,18 @@ public void setTime(long time) {
         this.time = time;
     }
 
+    public String getPartitionId() {
+        return partitionId;
+    }
+
+    public String getPartitionKey() {
+        return partitionKey;
+    }
+
+    public String getId() {
+        return id;
+    }
+
     /**
      * Type of incremental snapshot types
      */
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/PersistenceHelper.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/PersistenceHelper.java
index 88ec36c1a7..b3f739364e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/PersistenceHelper.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/PersistenceHelper.java
@@ -38,12 +38,12 @@ public final class PersistenceHelper {
     public static IncrementalSnapshotInfo convertRevision(String revision) {
         String[] items = revision.split(PersistenceConstants.REVISION_SEPARATOR);
         //Note: Here we discard the (items.length == 2) scenario which is handled by the full snapshot handling
-        if (items.length == 5) {
-            return new IncrementalSnapshotInfo(items[1], items[2], items[3],
-                    Long.parseLong(items[0]), IncrementalSnapshotInfo.SnapshotType.valueOf(items[4]));
-        } else if (items.length == 2) {
-            return new IncrementalSnapshotInfo(items[1], null, null,
-                    Long.parseLong(items[0]), IncrementalSnapshotInfo.SnapshotType.PERIODIC);
+        if (items.length == 7) {
+            return new IncrementalSnapshotInfo(items[1], items[2], items[4], items[5],
+                    Long.parseLong(items[0]), IncrementalSnapshotInfo.SnapshotType.valueOf(items[6]), items[3]);
+        } else if (items.length == 4) {
+            return new IncrementalSnapshotInfo(items[1], items[2], null, null,
+                    Long.parseLong(items[0]), IncrementalSnapshotInfo.SnapshotType.PERIODIC, items[3]);
         } else {
             throw new PersistenceStoreException("Invalid revision found '" + revision + "'!");
         }
@@ -65,13 +65,14 @@ public static PersistenceReference persist(IncrementalSnapshot serializeObj, Sid
         //Periodic state
         Map<String, Map<String, byte[]>> periodicStateBase = serializeObj.getPeriodicState();
         if (periodicStateBase != null) {
-            periodicStateBase.forEach((queryName, value) -> {
-                value.forEach((elementId, value1) -> {
+            periodicStateBase.forEach((partitionId, value) -> {
+                value.forEach((id, value1) -> {
+                    String[] items = id.split(PersistenceConstants.REVISION_SEPARATOR);
                     AsyncIncrementalSnapshotPersistor asyncIncrementSnapshotPersistor = new
                             AsyncIncrementalSnapshotPersistor(value1,
                             siddhiAppContext.getSiddhiContext().getIncrementalPersistenceStore(),
-                            new IncrementalSnapshotInfo(siddhiAppContext.getName(), queryName, elementId,
-                                    revisionTime, IncrementalSnapshotInfo.SnapshotType.PERIODIC));
+                            new IncrementalSnapshotInfo(siddhiAppContext.getName(), partitionId, items[1], items[2],
+                                    revisionTime, IncrementalSnapshotInfo.SnapshotType.PERIODIC, items[0]));
                     Future future = siddhiAppContext.getExecutorService().
                             submit(asyncIncrementSnapshotPersistor);
                     incrementalFutures.add(future);
@@ -81,13 +82,14 @@ public static PersistenceReference persist(IncrementalSnapshot serializeObj, Sid
         //Incremental base state
         Map<String, Map<String, byte[]>> incrementalStateBase = serializeObj.getIncrementalStateBase();
         if (incrementalStateBase != null) {
-            incrementalStateBase.forEach((queryName, value) -> {
-                value.forEach((elementId, value1) -> {
+            incrementalStateBase.forEach((partitionId, value) -> {
+                value.forEach((id, value1) -> {
+                    String[] items = id.split(PersistenceConstants.REVISION_SEPARATOR);
                     AsyncIncrementalSnapshotPersistor asyncIncrementSnapshotPersistor = new
                             AsyncIncrementalSnapshotPersistor(value1,
                             siddhiAppContext.getSiddhiContext().getIncrementalPersistenceStore(),
-                            new IncrementalSnapshotInfo(siddhiAppContext.getName(), queryName, elementId,
-                                    revisionTime, IncrementalSnapshotInfo.SnapshotType.BASE));
+                            new IncrementalSnapshotInfo(siddhiAppContext.getName(), partitionId, items[1], items[2],
+                                    revisionTime, IncrementalSnapshotInfo.SnapshotType.BASE, items[0]));
                     Future future = siddhiAppContext.getExecutorService().
                             submit(asyncIncrementSnapshotPersistor);
                     incrementalFutures.add(future);
@@ -98,13 +100,14 @@ public static PersistenceReference persist(IncrementalSnapshot serializeObj, Sid
         //Incremental state
         Map<String, Map<String, byte[]>> incrementalState = serializeObj.getIncrementalState();
         if (incrementalState != null) {
-            incrementalState.forEach((queryName, value) -> {
-                value.forEach((elementId, value1) -> {
+            incrementalState.forEach((partitionId, value) -> {
+                value.forEach((id, value1) -> {
+                    String[] items = id.split(PersistenceConstants.REVISION_SEPARATOR);
                     AsyncIncrementalSnapshotPersistor asyncIncrementSnapshotPersistor = new
                             AsyncIncrementalSnapshotPersistor(value1,
                             siddhiAppContext.getSiddhiContext().getIncrementalPersistenceStore(),
-                            new IncrementalSnapshotInfo(siddhiAppContext.getName(), queryName, elementId,
-                                    revisionTime, IncrementalSnapshotInfo.SnapshotType.INCREMENT));
+                            new IncrementalSnapshotInfo(siddhiAppContext.getName(), partitionId, items[1], items[2],
+                                    revisionTime, IncrementalSnapshotInfo.SnapshotType.INCREMENT, items[0]));
                     Future future = siddhiAppContext.getExecutorService().
                             submit(asyncIncrementSnapshotPersistor);
                     incrementalFutures.add(future);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
index bbcb5af7af..4b2dcdb40d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
@@ -22,13 +22,17 @@
 import io.siddhi.core.exception.CannotRestoreSiddhiAppStateException;
 import io.siddhi.core.exception.NoPersistenceStoreException;
 import io.siddhi.core.exception.PersistenceStoreException;
+import io.siddhi.core.exception.SiddhiAppRuntimeException;
 import io.siddhi.core.util.ThreadBarrier;
 import io.siddhi.core.util.persistence.IncrementalPersistenceStore;
 import io.siddhi.core.util.persistence.PersistenceStore;
 import io.siddhi.core.util.persistence.util.IncrementalSnapshotInfo;
+import io.siddhi.core.util.persistence.util.PersistenceConstants;
 import io.siddhi.core.util.persistence.util.PersistenceHelper;
-import io.siddhi.core.util.snapshot.state.SnapshotState;
+import io.siddhi.core.util.snapshot.state.Snapshot;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateHolder;
 import org.apache.log4j.Logger;
 
 import java.util.Comparator;
@@ -41,54 +45,57 @@
 
 /**
  * Service level implementation to take/restore snapshots of processing elements.
+ * Memory   : PartitionId + QueryName + ElementId + PartitionKey + Item
+ * Snapshot : PartitionId + PartitionKey + QueryName + ElementId + Item
  */
 public class SnapshotService {
     private static final Logger log = Logger.getLogger(SnapshotService.class);
-    private static final ThreadLocal<Boolean> skipSnapshotableThreadLocal = new ThreadLocal<Boolean>();
-
+    private static final ThreadLocal<Boolean> skipStateStorageThreadLocal = new ThreadLocal<Boolean>();
     private final ThreadBarrier threadBarrier;
-    private ConcurrentHashMap<String, Map<String, Snapshotable>> snapshotableMap = new ConcurrentHashMap<>();
+    private ConcurrentHashMap<String, PartitionIdStateHolder> partitionIdStates;
     private SiddhiAppContext siddhiAppContext;
 
     public SnapshotService(SiddhiAppContext siddhiAppContext) {
         this.siddhiAppContext = siddhiAppContext;
         this.threadBarrier = siddhiAppContext.getThreadBarrier();
+        this.partitionIdStates = new ConcurrentHashMap<String, PartitionIdStateHolder>();
     }
 
-    public static ThreadLocal<Boolean> getSkipSnapshotableThreadLocal() {
-        return skipSnapshotableThreadLocal;
+    public static ThreadLocal<Boolean> getSkipStateStorageThreadLocal() {
+        return skipStateStorageThreadLocal;
     }
 
-    public ConcurrentHashMap<String, Map<String, Snapshotable>> getSnapshotableMap() {
-        return snapshotableMap;
+    public ConcurrentHashMap<String, PartitionIdStateHolder> getStates() {
+        return partitionIdStates;
     }
 
-    public synchronized void addSnapshotable(String snapshotableName, Snapshotable snapshotable) {
-        Boolean skipSnapshotable = skipSnapshotableThreadLocal.get();
+    public synchronized Map<String, StateHolder> getStateHolderMap(String partitionId,
+                                                                   String queryName) {
+        Boolean skipSnapshotable = skipStateStorageThreadLocal.get();
         if (skipSnapshotable == null || !skipSnapshotable) {
-            Map<String, Snapshotable> snapshotableMap = this.snapshotableMap.get(snapshotableName);
-
-            // If List does not exist create it.
-            if (snapshotableMap == null) {
-                snapshotableMap = new HashMap<String, Snapshotable>();
-                snapshotableMap.put(snapshotable.getElementId(), snapshotable);
-                this.snapshotableMap.put(snapshotableName, snapshotableMap);
-            } else {
-                // add if item is not already in list
-                snapshotableMap.putIfAbsent(snapshotable.getElementId(), snapshotable);
+            PartitionIdStateHolder partitionIdStateHolder = this.partitionIdStates.get(partitionId);
+            if (partitionIdStateHolder == null) {
+                partitionIdStateHolder = new PartitionIdStateHolder(partitionId);
+                this.partitionIdStates.put(partitionId, partitionIdStateHolder);
             }
+            ElementStateHolder elementStateHolder = partitionIdStateHolder.getElementState(queryName);
+            if (elementStateHolder == null) {
+                elementStateHolder = new ElementStateHolder(queryName, new HashMap<>());
+                partitionIdStateHolder.addElementState(queryName, elementStateHolder);
+            }
+            return elementStateHolder.elementHolderMap;
         }
+        return null;
     }
 
-    public synchronized void removeSnapshotable(String snapshotableName, Snapshotable snapshotable) {
-        Boolean skipSnapshotable = skipSnapshotableThreadLocal.get();
+    public synchronized void removeStateHolderMap(String partitionId, String queryName) {
+        Boolean skipSnapshotable = skipStateStorageThreadLocal.get();
         if (skipSnapshotable == null || !skipSnapshotable) {
-            Map<String, Snapshotable> snapshotableMap = this.snapshotableMap.get(snapshotableName);
-            if (snapshotableMap != null) {
-                snapshotableMap = new HashMap<>();
-                snapshotableMap.remove(snapshotable.getElementId(), snapshotable);
-                if (snapshotableMap.isEmpty()) {
-                    this.snapshotableMap.remove(snapshotableName);
+            PartitionIdStateHolder partitionIdStateHolder = this.partitionIdStates.get(partitionId);
+            if (partitionIdStateHolder != null) {
+                partitionIdStateHolder.queryStateHolderMap.remove(queryName);
+                if (partitionIdStateHolder.queryStateHolderMap.isEmpty()) {
+                    this.partitionIdStates.remove(partitionId);
                 }
             }
         }
@@ -97,58 +104,84 @@ public synchronized void removeSnapshotable(String snapshotableName, Snapshotabl
     public byte[] fullSnapshot() {
         try {
             SnapshotRequest.requestForFullSnapshot(true);
-            Map<String, Map<String, Object>> elementSnapshotMapFull = new HashMap<>();
+            Map<String, Map<String, Map<String, Map<String, Map<String, Object>>>>> fullSnapshot = new HashMap<>();
             byte[] serializedFullState = null;
             if (log.isDebugEnabled()) {
                 log.debug("Taking snapshot ...");
             }
             try {
                 threadBarrier.lock();
-                for (Map.Entry<String, Map<String, Snapshotable>> entry : snapshotableMap.entrySet()) {
-                    Map<String, Object> elementWiseFullSnapshots = new HashMap<>();
-                    for (Map.Entry snapshotableEntry : entry.getValue().entrySet()) {
-                        Snapshotable snapshotableObj = ((Snapshotable) snapshotableEntry.getValue());
-                        Map<String, Object> currentState = ((Snapshotable) snapshotableEntry.getValue()).currentState();
-                        if (currentState != null) {
-                            Map<String, Object> elementWiseSnapshots = new HashMap<>();
-                            for (Map.Entry<String, Object> item2 : currentState.entrySet()) {
-                                String key = item2.getKey();
-                                Object snapShot = item2.getValue();
-                                if (snapShot instanceof SnapshotState) {
-                                    if (((SnapshotState) snapShot).isIncrementalSnapshot()) {
-                                        throw new NoPersistenceStoreException("No incremental persistence store " +
-                                                "exist to store incremental snapshot of siddhiApp:'"
-                                                + siddhiAppContext.getName() + "' subElement:'" + entry.getKey()
-                                                + "' elementId:'" + snapshotableObj.getElementId()
-                                                + "' and key:'" + key + "'");
-                                    } else {
-                                        elementWiseSnapshots.put(key, snapShot);
+                for (Map.Entry<String, PartitionIdStateHolder> partitionIdState : partitionIdStates.entrySet()) {
+                    for (Map.Entry<String, ElementStateHolder> queryState :
+                            partitionIdState.getValue().queryStateHolderMap.entrySet()) {
+                        for (Map.Entry<String, StateHolder> elementState :
+                                queryState.getValue().elementHolderMap.entrySet()) {
+                            Map<String, State> partitionKeyStates = elementState.getValue().getAllStates();
+                            try {
+                                for (Map.Entry<String, State> partitionKeyState : partitionKeyStates.entrySet()) {
+                                    State state = partitionKeyState.getValue();
+                                    Map<String, Object> itemStates = state.snapshot();
+                                    if (itemStates != null) {
+                                        Map<String, Object> itemSnapshots = new HashMap<>();
+                                        for (Map.Entry<String, Object> itemState : itemStates.entrySet()) {
+                                            if (itemState.getValue() instanceof Snapshot) {
+                                                if (((Snapshot) itemState.getValue()).isIncrementalSnapshot()) {
+                                                    throw new NoPersistenceStoreException("No incremental persistence "
+                                                            + "store exist to store incremental snapshot of siddhiApp:'"
+                                                            + siddhiAppContext.getName()
+                                                            + "' subElement:'" + queryState.getKey()
+                                                            + "' elementId:'" + elementState.getKey()
+                                                            + "' partitionKey:'" + partitionKeyState.getKey()
+                                                            + "' and itemKey:'" + itemState.getKey() + "'");
+                                                } else {
+                                                    itemSnapshots.put(itemState.getKey(), itemState.getValue());
+                                                }
+                                            } else {
+                                                itemSnapshots.put(itemState.getKey(), itemState.getValue());
+                                            }
+                                        }
+                                        Map<String, Map<String, Map<String, Map<String, Object>>>> partitionIdSnapshot =
+                                                fullSnapshot.computeIfAbsent(
+                                                        partitionIdState.getKey(),
+                                                        k -> new HashMap<>());
+                                        Map<String, Map<String, Map<String, Object>>> partitionKeySnapshot =
+                                                partitionIdSnapshot.computeIfAbsent(
+                                                        partitionKeyState.getKey(),
+                                                        k -> new HashMap<>());
+                                        Map<String, Map<String, Object>> querySnapshot =
+                                                partitionKeySnapshot.computeIfAbsent(
+                                                        queryState.getKey(),
+                                                        k -> new HashMap<>());
+                                        Map<String, Object> elementSnapshot = querySnapshot.get(elementState.getKey());
+                                        if (elementSnapshot == null) {
+                                            querySnapshot.put(elementState.getKey(), itemSnapshots);
+                                        } else {
+                                            throw new SiddhiAppRuntimeException("Duplicate state exist for siddhiApp:'"
+                                                    + siddhiAppContext.getName()
+                                                    + "' partitionKey:'" + partitionKeyState.getKey()
+                                                    + "' subElement:'" + queryState.getKey()
+                                                    + "' elementId:'" + elementState.getKey() + "'");
+                                        }
                                     }
-                                } else {
-                                    elementWiseSnapshots.put(key, snapShot);
                                 }
-                            }
-                            if (!elementWiseSnapshots.isEmpty()) {
-                                elementWiseFullSnapshots.put(snapshotableObj.getElementId(), elementWiseSnapshots);
+                            } finally {
+                                elementState.getValue().returnStates(partitionKeyStates);
                             }
                         }
                     }
-                    if (!elementWiseFullSnapshots.isEmpty()) {
-                        elementSnapshotMapFull.put(entry.getKey(), elementWiseFullSnapshots);
-                    }
                 }
                 if (log.isDebugEnabled()) {
-                    log.debug("SnapshotState serialization started ...");
+                    log.debug("Snapshot serialization started ...");
                 }
-                serializedFullState = ByteSerializer.objectToByte(elementSnapshotMapFull, siddhiAppContext);
+                serializedFullState = ByteSerializer.objectToByte(fullSnapshot, siddhiAppContext);
                 if (log.isDebugEnabled()) {
-                    log.debug("SnapshotState serialization finished.");
+                    log.debug("Snapshot serialization finished.");
                 }
             } finally {
                 threadBarrier.unlock();
             }
             if (log.isDebugEnabled()) {
-                log.debug("SnapshotState taken for Siddhi app '" + siddhiAppContext.getName() + "'");
+                log.debug("Snapshot taken for Siddhi app '" + siddhiAppContext.getName() + "'");
             }
             return serializedFullState;
         } finally {
@@ -159,84 +192,79 @@ public byte[] fullSnapshot() {
     public IncrementalSnapshot incrementalSnapshot() {
         try {
             SnapshotRequest.requestForFullSnapshot(false);
-            Map<String, Map<String, byte[]>> elementSnapshotMapIncremental = new HashMap<>();
-            Map<String, Map<String, byte[]>> elementSnapshotMapIncrementalBase = new HashMap<>();
-            Map<String, Map<String, byte[]>> elementSnapshotMapPeriodic = new HashMap<>();
+            Map<String, Map<String, byte[]>> incrementalSnapshotMap = new HashMap<>();
+            Map<String, Map<String, byte[]>> incrementalBaseSnapshotMap = new HashMap<>();
+            Map<String, Map<String, byte[]>> periodicSnapshotMap = new HashMap<>();
             if (log.isDebugEnabled()) {
                 log.debug("Taking snapshot ...");
             }
             try {
                 threadBarrier.lock();
-                for (Map.Entry<String, Map<String, Snapshotable>> entry : snapshotableMap.entrySet()) {
-                    Map<String, byte[]> elementWiseIncrementalSnapshots = new HashMap<>();
-                    Map<String, byte[]> elementWiseIncrementalSnapshotsBase = new HashMap<>();
-                    Map<String, byte[]> elementWisePeriodicSnapshots = new HashMap<>();
-                    for (Map.Entry snapshotableEntry : entry.getValue().entrySet()) {
-                        Snapshotable snapshotableObj = ((Snapshotable) snapshotableEntry.getValue());
-                        Map<String, Object> currentState = snapshotableObj.currentState();
-                        if (currentState != null) {
-                            Map<String, Object> incrementalSnapshotableMap = new HashMap<>();
-                            Map<String, Object> incrementalSnapshotableMapBase = new HashMap<>();
-                            Map<String, Object> periodicSnapshotableMap = new HashMap<>();
-                            for (Map.Entry<String, Object> stateEntry : currentState.entrySet()) {
-                                String key = stateEntry.getKey();
-                                Object snapShot = stateEntry.getValue();
-                                if (snapShot instanceof SnapshotState) {
-                                    if (((SnapshotState) snapShot).isIncrementalSnapshot()) {
-                                        incrementalSnapshotableMap.put(key, snapShot);
-                                    } else {
-                                        incrementalSnapshotableMapBase.put(key, snapShot);
+                for (Map.Entry<String, PartitionIdStateHolder> partitionIdState : partitionIdStates.entrySet()) {
+                    for (Map.Entry<String, ElementStateHolder> queryState :
+                            partitionIdState.getValue().queryStateHolderMap.entrySet()) {
+                        for (Map.Entry<String, StateHolder> elementState :
+                                queryState.getValue().elementHolderMap.entrySet()) {
+                            Map<String, State> partitionKeyStates = elementState.getValue().getAllStates();
+                            try {
+                                for (Map.Entry<String, State> partitionKeyState : partitionKeyStates.entrySet()) {
+                                    State state = partitionKeyState.getValue();
+                                    Map<String, Object> itemStates = state.snapshot();
+                                    if (itemStates != null) {
+                                        Map<String, Object> itemSnapshotsIncremental = new HashMap<>();
+                                        Map<String, Object> itemSnapshotsIncrementalBase = new HashMap<>();
+                                        Map<String, Object> itemSnapshotsPeriodic = new HashMap<>();
+                                        for (Map.Entry<String, Object> itemState : itemStates.entrySet()) {
+                                            if (itemState.getValue() instanceof Snapshot) {
+                                                if (((Snapshot) itemState).isIncrementalSnapshot()) {
+                                                    itemSnapshotsIncremental.put(itemState.getKey(),
+                                                            itemState.getValue());
+                                                } else {
+                                                    itemSnapshotsIncrementalBase.put(
+                                                            itemState.getKey(), itemState.getValue());
+                                                }
+                                            } else {
+                                                itemSnapshotsPeriodic.put(itemState.getKey(), itemState.getValue());
+                                            }
+                                        }
+                                        if (!itemSnapshotsIncremental.isEmpty()) {
+                                            addToSnapshotIncrements(incrementalSnapshotMap, partitionIdState,
+                                                    queryState, elementState, partitionKeyState,
+                                                    itemSnapshotsIncremental);
+                                        }
+                                        if (!itemSnapshotsIncrementalBase.isEmpty()) {
+                                            addToSnapshotIncrements(incrementalBaseSnapshotMap, partitionIdState,
+                                                    queryState, elementState, partitionKeyState,
+                                                    itemSnapshotsIncrementalBase);
+                                        }
+                                        if (!itemSnapshotsPeriodic.isEmpty()) {
+                                            addToSnapshotIncrements(periodicSnapshotMap, partitionIdState, queryState,
+                                                    elementState, partitionKeyState, itemSnapshotsPeriodic);
+                                        }
                                     }
-                                } else {
-                                    periodicSnapshotableMap.put(key, snapShot);
                                 }
-                            }
-                            if (log.isDebugEnabled()) {
-                                log.debug("SnapshotState serialization started ...");
-                            }
-                            if (!incrementalSnapshotableMap.isEmpty()) {
-                                //Do we need to get and then update?
-                                elementWiseIncrementalSnapshots.put(snapshotableObj.getElementId(),
-                                        ByteSerializer.objectToByte(incrementalSnapshotableMap, siddhiAppContext));
-                            }
-                            if (!incrementalSnapshotableMapBase.isEmpty()) {
-                                elementWiseIncrementalSnapshotsBase.put(snapshotableObj.getElementId(),
-                                        ByteSerializer.objectToByte(incrementalSnapshotableMapBase, siddhiAppContext));
-                            }
-                            if (!periodicSnapshotableMap.isEmpty()) {
-                                elementWisePeriodicSnapshots.put(snapshotableObj.getElementId(),
-                                        ByteSerializer.objectToByte(periodicSnapshotableMap, siddhiAppContext));
-                            }
-                            if (log.isDebugEnabled()) {
-                                log.debug("SnapshotState serialization finished.");
+                            } finally {
+                                elementState.getValue().returnStates(partitionKeyStates);
                             }
                         }
                     }
-                    if (!elementWiseIncrementalSnapshots.isEmpty()) {
-                        elementSnapshotMapIncremental.put(entry.getKey(), elementWiseIncrementalSnapshots);
-                    }
-                    if (!elementWiseIncrementalSnapshotsBase.isEmpty()) {
-                        elementSnapshotMapIncrementalBase.put(entry.getKey(), elementWiseIncrementalSnapshotsBase);
-                    }
-                    if (!elementWisePeriodicSnapshots.isEmpty()) {
-                        elementSnapshotMapPeriodic.put(entry.getKey(), elementWisePeriodicSnapshots);
-                    }
                 }
+
             } finally {
                 threadBarrier.unlock();
             }
             if (log.isDebugEnabled()) {
-                log.debug("SnapshotState taken for Siddhi app '" + siddhiAppContext.getName() + "'");
+                log.debug("Snapshot taken for Siddhi app '" + siddhiAppContext.getName() + "'");
             }
             IncrementalSnapshot snapshot = new IncrementalSnapshot();
-            if (!elementSnapshotMapIncremental.isEmpty()) {
-                snapshot.setIncrementalState(elementSnapshotMapIncremental);
+            if (!periodicSnapshotMap.isEmpty()) {
+                snapshot.setIncrementalState(periodicSnapshotMap);
             }
-            if (!elementSnapshotMapIncrementalBase.isEmpty()) {
-                snapshot.setIncrementalStateBase(elementSnapshotMapIncrementalBase);
+            if (!incrementalBaseSnapshotMap.isEmpty()) {
+                snapshot.setIncrementalStateBase(incrementalBaseSnapshotMap);
             }
-            if (!elementSnapshotMapPeriodic.isEmpty()) {
-                snapshot.setPeriodicState(elementSnapshotMapPeriodic);
+            if (!incrementalSnapshotMap.isEmpty()) {
+                snapshot.setPeriodicState(incrementalSnapshotMap);
             }
             return snapshot;
         } finally {
@@ -244,19 +272,45 @@ public IncrementalSnapshot incrementalSnapshot() {
         }
     }
 
+    private void addToSnapshotIncrements(Map<String, Map<String, byte[]>> incrementalSnapshotMap,
+                                         Map.Entry<String, PartitionIdStateHolder> partitionIdState,
+                                         Map.Entry<String, ElementStateHolder> queryState,
+                                         Map.Entry<String, StateHolder> elementState,
+                                         Map.Entry<String, State> partitionKeyState,
+                                         Map<String, Object> itemSnapshotsIncremental) {
+        String id = partitionKeyState.getKey() + PersistenceConstants.REVISION_SEPARATOR
+                + queryState.getKey() + PersistenceConstants.REVISION_SEPARATOR
+                + elementState.getKey();
+        Map<String, byte[]> partitionIdSnapshot =
+                incrementalSnapshotMap.computeIfAbsent(
+                        partitionIdState.getKey(),
+                        k -> new HashMap<>());
+        partitionIdSnapshot.put(id, ByteSerializer.objectToByte(
+                itemSnapshotsIncremental, siddhiAppContext));
+    }
+
     public Map<String, Object> queryState(String queryName) {
-        Map<String, Object> state = new HashMap<>();
+        Map<String, Object> queryState = new HashMap<>();
         try {
             // Lock the threads in Siddhi
             threadBarrier.lock();
-            Map<String, Snapshotable> map = snapshotableMap.get(queryName);
-
-            if (map != null) {
-                for (Map.Entry entry : map.entrySet()) {
-                    Snapshotable element = (Snapshotable) entry.getValue();
-                    Map<String, Object> elementState = element.currentState();
-                    String elementId = element.getElementId();
-                    state.put(elementId, elementState);
+            PartitionIdStateHolder partitionIdStateHolder = partitionIdStates.get("");
+            if (partitionIdStateHolder != null) {
+                ElementStateHolder elementStateHolder = partitionIdStateHolder.queryStateHolderMap.get(queryName);
+                if (elementStateHolder != null) {
+                    for (Map.Entry<String, StateHolder> elementState : elementStateHolder.elementHolderMap.entrySet()) {
+                        Map<String, State> partitionKeyStates = elementState.getValue().getAllStates();
+                        try {
+                            for (Map.Entry<String, State> partitionKeyState : partitionKeyStates.entrySet()) {
+                                String id = partitionKeyState.getKey() + "_"
+                                        + queryName + "_"
+                                        + elementState.getKey();
+                                queryState.put(id, partitionKeyState.getValue().snapshot());
+                            }
+                        } finally {
+                            elementState.getValue().returnStates(partitionKeyStates);
+                        }
+                    }
                 }
             }
         } finally {
@@ -265,7 +319,7 @@ public Map<String, Object> queryState(String queryName) {
         if (log.isDebugEnabled()) {
             log.debug("Taking snapshot finished.");
         }
-        return state;
+        return queryState;
     }
 
     public void restore(byte[] snapshot) throws CannotRestoreSiddhiAppStateException {
@@ -273,71 +327,90 @@ public void restore(byte[] snapshot) throws CannotRestoreSiddhiAppStateException
             throw new CannotRestoreSiddhiAppStateException("Restoring of Siddhi app " + siddhiAppContext.
                     getName() + " failed due to no snapshot.");
         }
-        Map<String, Map<String, Map<String, Object>>> snapshotsByQueryName =
-                (Map<String, Map<String, Map<String, Object>>>) ByteSerializer.byteToObject(snapshot, siddhiAppContext);
-        if (snapshotsByQueryName == null) {
+        Map<String, Map<String, Map<String, Map<String, Map<String, Object>>>>> fullSnapshot =
+                (Map<String, Map<String, Map<String, Map<String, Map<String, Object>>>>>)
+                        ByteSerializer.byteToObject(snapshot, siddhiAppContext);
+        if (fullSnapshot == null) {
             throw new CannotRestoreSiddhiAppStateException("Restoring of Siddhi app " + siddhiAppContext.
                     getName() + " failed due to invalid snapshot.");
         }
         try {
             threadBarrier.lock();
-            if (snapshotableMap.containsKey("partition")) {
-                Map<String, Snapshotable> partitionSnapshotables = snapshotableMap.get("partition");
-
-                try {
-                    if (partitionSnapshotables != null) {
-                        for (Map.Entry entry : partitionSnapshotables.entrySet()) {
-                            Snapshotable snapshotable = (Snapshotable) entry.getValue();
-                            Map<String, Map<String, Object>> snapshotsByElementId =
-                                    snapshotsByQueryName.get("partition");
-                            snapshotable.restoreState(snapshotsByElementId.get(snapshotable.getElementId()));
-                        }
+            try {
+                for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, Object>>>>> partitionIdSnapshot :
+                        fullSnapshot.entrySet()) {
+                    PartitionIdStateHolder partitionStateHolder = partitionIdStates.get(partitionIdSnapshot.getKey());
+                    if (partitionStateHolder == null) {
+                        continue;
                     }
-                } catch (Throwable t) {
-                    throw new CannotRestoreSiddhiAppStateException("Restoring of Siddhi app " + siddhiAppContext.
-                            getName() + " not completed properly. This can occur if the content of Siddhi app has " +
-                            "changed since it was last state persisted, or if the Siddhi app was not given a name. " +
-                            "Make sure to provide a name to the Siddhi app by adding '@app:name('<a name>')' " +
-                            "annotation and clean the persistence store if you have done modifications " +
-                            "to the Siddhi app such that it can perform a fresh deployment.", t);
-                }
-            }
-
-            for (Map.Entry<String, Map<String, Snapshotable>> entry : snapshotableMap.entrySet()) {
-                if (!entry.getKey().equals("partition")) {
-                    Map<String, Snapshotable> map = entry.getValue();
-                    try {
-                        for (Map.Entry snapshotableEntry : map.entrySet()) {
-                            Snapshotable snapshotable = (Snapshotable) snapshotableEntry.getValue();
-                            Map<String, Map<String, Object>> snapshotsByElementId =
-                                    snapshotsByQueryName.get(entry.getKey());
-                            if (snapshotsByElementId != null) {
-                                Map<String, Object> snapshotsByKey = snapshotsByElementId.get(
-                                        snapshotable.getElementId());
-                                if (snapshotsByKey != null) {
-                                    Map<String, Object> snapshotRestoresByKey = new HashMap<>();
-                                    for (Map.Entry<String, Object> snapshotsByKeyEntry : snapshotsByKey.entrySet()) {
-                                        if (snapshotsByKeyEntry.getValue() instanceof SnapshotState) {
-                                            SnapshotStateList snapshotStateList = new SnapshotStateList();
-                                            snapshotStateList.putSnapshotState(0L,
-                                                    (SnapshotState) snapshotsByKeyEntry.getValue());
-                                            snapshotRestoresByKey.put(snapshotsByKeyEntry.getKey(), snapshotStateList);
-                                        } else {
-                                            snapshotRestoresByKey.put(snapshotsByKeyEntry.getKey(),
-                                                    snapshotsByKeyEntry.getValue());
+                    for (Map.Entry<String, Map<String, Map<String, Map<String, Object>>>> partitionKeySnapshot :
+                            partitionIdSnapshot.getValue().entrySet()) {
+                        for (Map.Entry<String, Map<String, Map<String, Object>>> querySnapshot :
+                                partitionKeySnapshot.getValue().entrySet()) {
+                            ElementStateHolder elementStateHolder =
+                                    partitionStateHolder.queryStateHolderMap.get(querySnapshot.getKey());
+                            if (elementStateHolder == null) {
+                                continue;
+                            }
+                            for (Map.Entry<String, Map<String, Object>> elementSnapshot :
+                                    querySnapshot.getValue().entrySet()) {
+                                StateHolder stateHolder =
+                                        elementStateHolder.elementHolderMap.get(elementSnapshot.getKey());
+                                if (stateHolder == null) {
+                                    continue;
+                                }
+                                try {
+                                    String partitionKey = null;
+                                    String groupByKey = null;
+                                    if (partitionKeySnapshot.getKey() != null) {
+                                        String[] keys = partitionKeySnapshot.getKey().split("--");
+                                        if (keys.length == 2) {
+                                            if (!keys[0].equals("null")) {
+                                                partitionKey = keys[0];
+                                            }
+                                            if (!keys[1].equals("null")) {
+                                                groupByKey = keys[1];
+                                            }
                                         }
                                     }
-                                    snapshotable.restoreState(snapshotRestoresByKey);
+                                    SiddhiAppContext.startPartitionFlow(partitionKey);
+                                    SiddhiAppContext.startGroupByFlow(groupByKey);
+                                    State state = stateHolder.getState();
+                                    try {
+                                        if (state == null) {
+                                            continue;
+                                        }
+                                        Map<String, Object> snapshotRestores = new HashMap<>();
+                                        for (Map.Entry<String, Object> itemSnapshot :
+                                                elementSnapshot.getValue().entrySet()) {
+                                            if (itemSnapshot.getValue() instanceof Snapshot) {
+                                                SnapshotStateList snapshotStateList = new SnapshotStateList();
+                                                snapshotStateList.putSnapshotState(0L,
+                                                        (Snapshot) itemSnapshot.getValue());
+                                                snapshotRestores.put(itemSnapshot.getKey(), snapshotStateList);
+                                            } else {
+                                                snapshotRestores.put(itemSnapshot.getKey(),
+                                                        itemSnapshot.getValue());
+                                            }
+                                        }
+                                        state.restore(snapshotRestores);
+                                    } finally {
+                                        stateHolder.returnState(state);
+                                    }
+                                } finally {
+                                    SiddhiAppContext.stopPartitionFlow();
+                                    SiddhiAppContext.stopGroupByFlow();
                                 }
                             }
                         }
-                    } catch (Throwable t) {
-                        throw new CannotRestoreSiddhiAppStateException("Restoring of Siddhi app " +
-                                siddhiAppContext.getName() + " not completed properly because content of Siddhi " +
-                                "app has changed since last state persistence. Clean persistence store for a " +
-                                "fresh deployment.", t);
                     }
+
                 }
+            } catch (Throwable t) {
+                throw new CannotRestoreSiddhiAppStateException("Restoring of Siddhi app " +
+                        siddhiAppContext.getName() + " not completed properly because content of Siddhi " +
+                        "app has changed since last state persistence. Clean persistence store for a " +
+                        "fresh deployment.", t);
             }
         } finally {
             threadBarrier.unlock();
@@ -348,91 +421,142 @@ public void restore(Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInf
             throws CannotRestoreSiddhiAppStateException {
         try {
             threadBarrier.lock();
-            if (snapshotableMap.containsKey("partition")) {
-                Map<String, Snapshotable> partitionSnapshotables = snapshotableMap.get("partition");
-
-                try {
-                    if (partitionSnapshotables != null) {
-                        for (Map.Entry snapshotableEntry : partitionSnapshotables.entrySet()) {
-                            Snapshotable snapshotable = (Snapshotable) snapshotableEntry.getValue();
-                            Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> incrementalStateByElementId
-                                    = snapshot.get("partition");
-                            restoreIncrementalSnapshot(snapshotable, incrementalStateByElementId);
-                        }
+            try {
+                for (Map.Entry<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>
+                        partitionIdSnapshot : snapshot.entrySet()) {
+                    PartitionIdStateHolder partitionStateHolder = partitionIdStates.get(partitionIdSnapshot.getKey());
+                    if (partitionStateHolder == null) {
+                        continue;
                     }
-                } catch (Throwable t) {
-                    throw new CannotRestoreSiddhiAppStateException("Restoring of Siddhi app " + siddhiAppContext.
-                            getName() + " not completed properly because content of Siddhi app has changed since "
-                            + "last state persistence. Clean persistence store for a fresh deployment.", t);
-                }
-            }
-
-            for (Map.Entry<String, Map<String, Snapshotable>> entry : snapshotableMap.entrySet()) {
-                if (!entry.getKey().equals("partition")) {
-                    Map<String, Snapshotable> map = entry.getValue();
-                    try {
-                        for (Map.Entry snapshotableEntry : map.entrySet()) {
-                            Snapshotable snapshotable = (Snapshotable) snapshotableEntry.getValue();
-                            Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> incrementalStateByElementId
-                                    = snapshot.get(entry.getKey());
-                            restoreIncrementalSnapshot(snapshotable, incrementalStateByElementId);
-                        }
-                    } catch (Throwable t) {
-                        throw new CannotRestoreSiddhiAppStateException("Restoring of Siddhi app " +
-                                siddhiAppContext.getName() + " not completed properly because content of Siddhi " +
-                                "app has changed since last state persistence. Clean persistence store for a " +
-                                "fresh deployment.", t);
+                    for (Iterator<Map.Entry<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>> iterator =
+                         partitionIdSnapshot.getValue().entrySet().iterator(); iterator.hasNext(); ) {
+                        Map.Entry<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> partitionKeySnapshot =
+                                iterator.next();
+                        restoreIncrementalSnapshot(partitionStateHolder, partitionKeySnapshot.getValue());
+                        iterator.remove();
                     }
+
                 }
+            } catch (Throwable t) {
+                throw new CannotRestoreSiddhiAppStateException("Restoring of Siddhi app " +
+                        siddhiAppContext.getName() + " not completed properly because content of Siddhi " +
+                        "app has changed since last state persistence. Clean persistence store for a " +
+                        "fresh deployment.", t);
             }
         } finally {
             threadBarrier.unlock();
         }
     }
 
-    private void restoreIncrementalSnapshot(Snapshotable snapshotable,
-                                            Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>
-                                                    incrementalStateByElementId) {
-        if (incrementalStateByElementId != null) {
-            Map<Long, Map<IncrementalSnapshotInfo, byte[]>> incrementalStateByTime
-                    = incrementalStateByElementId.get(snapshotable.getElementId());
-            if (incrementalStateByTime != null) {
-                Map<String, Object> deserializedElementStateMap = new HashMap<>();
-                for (Map.Entry<Long, Map<IncrementalSnapshotInfo, byte[]>> incrementalStateByTimeEntry :
-                        incrementalStateByTime.entrySet()) {
-                    for (Map.Entry<IncrementalSnapshotInfo, byte[]> incrementalStateByInfoEntry :
-                            incrementalStateByTimeEntry.getValue().entrySet()) {
+    private void restoreIncrementalSnapshot(PartitionIdStateHolder partitionIdStateHolder,
+                                            Map<Long, Map<IncrementalSnapshotInfo, byte[]>> incrementalStateByTime) {
+        if (incrementalStateByTime != null) {
+            String id = null;
+            State state = null;
+            StateHolder stateHolder = null;
+            Map<String, Object> deserializedStateMap = null;
+            try {
+                for (Iterator<Map.Entry<Long, Map<IncrementalSnapshotInfo, byte[]>>> iterator =
+                     incrementalStateByTime.entrySet().iterator(); iterator.hasNext(); ) {
+                    Map.Entry<Long, Map<IncrementalSnapshotInfo, byte[]>> incrementalStateByTimeEntry = iterator.next();
+                    iterator.remove();
+                    for (Iterator<Map.Entry<IncrementalSnapshotInfo, byte[]>> iterator1 =
+                         incrementalStateByTimeEntry.getValue().entrySet().iterator(); iterator1.hasNext(); ) {
+                        Map.Entry<IncrementalSnapshotInfo, byte[]> incrementalStateByInfoEntry = iterator1.next();
+                        iterator1.remove();
+                        IncrementalSnapshotInfo incrementalSnapshotInfo = incrementalStateByInfoEntry.getKey();
                         Map<String, Object> singleIncrementSnapshot = (Map<String, Object>)
                                 ByteSerializer.byteToObject(incrementalStateByInfoEntry.getValue(), siddhiAppContext);
                         if (singleIncrementSnapshot != null) {
-                            for (Map.Entry<String, Object> singleIncrementSnapshotEntry :
-                                    singleIncrementSnapshot.entrySet()) {
-                                if (singleIncrementSnapshotEntry.getValue() instanceof SnapshotState) {
-                                    SnapshotState snapshotState = (SnapshotState)
-                                            singleIncrementSnapshotEntry.getValue();
-                                    SnapshotStateList snapshotStateList = (SnapshotStateList)
-                                            deserializedElementStateMap.computeIfAbsent(
-                                                    singleIncrementSnapshotEntry.getKey(),
-                                                    k -> new SnapshotStateList());
-                                    if (snapshotState.isIncrementalSnapshot()) {
-                                        snapshotStateList.putSnapshotState(
-                                                incrementalStateByTimeEntry.getKey(),
-                                                snapshotState);
+                            if (!incrementalSnapshotInfo.getId().equals(id)) {
+                                if (id != null) {
+                                    state.restore(deserializedStateMap);
+                                    SiddhiAppContext.startPartitionFlow(id);
+                                    try {
+                                        stateHolder.returnState(state);
+                                    } finally {
+                                        SiddhiAppContext.stopPartitionFlow();
+                                    }
+                                    id = null;
+                                    state = null;
+                                    stateHolder = null;
+                                    deserializedStateMap = null;
+                                }
+                                ElementStateHolder elementStateHolder = partitionIdStateHolder.queryStateHolderMap.get(
+                                        incrementalSnapshotInfo.getQueryName());
+                                if (elementStateHolder == null) {
+                                    continue;
+                                }
+                                stateHolder = elementStateHolder.elementHolderMap.get(
+                                        incrementalSnapshotInfo.getElementId());
+                                if (stateHolder == null) {
+                                    continue;
+                                }
+                                SiddhiAppContext.startPartitionFlow(incrementalSnapshotInfo.getPartitionKey());
+                                try {
+                                    state = stateHolder.getState();
+                                } finally {
+                                    SiddhiAppContext.stopPartitionFlow();
+                                }
+                                if (state != null) {
+                                    id = incrementalSnapshotInfo.getId();
+                                    deserializedStateMap = new HashMap<>();
+                                }
+                            }
+                            if (state != null) {
+                                for (Map.Entry<String, Object> singleIncrementSnapshotEntry :
+                                        singleIncrementSnapshot.entrySet()) {
+                                    if (singleIncrementSnapshotEntry.getValue() instanceof Snapshot) {
+                                        Snapshot snapshot = (Snapshot)
+                                                singleIncrementSnapshotEntry.getValue();
+                                        SnapshotStateList snapshotStateList = (SnapshotStateList)
+                                                deserializedStateMap.computeIfAbsent(
+                                                        singleIncrementSnapshotEntry.getKey(),
+                                                        k -> new SnapshotStateList());
+                                        if (snapshot.isIncrementalSnapshot()) {
+                                            snapshotStateList.putSnapshotState(
+                                                    incrementalStateByTimeEntry.getKey(),
+                                                    snapshot);
+                                        } else {
+                                            snapshotStateList.getSnapshotStates().clear();
+                                            snapshotStateList.putSnapshotState(
+                                                    incrementalStateByTimeEntry.getKey(),
+                                                    snapshot);
+                                        }
                                     } else {
-                                        snapshotStateList.getSnapshotStates().clear();
-                                        snapshotStateList.putSnapshotState(
-                                                incrementalStateByTimeEntry.getKey(),
-                                                snapshotState);
+                                        deserializedStateMap.put(singleIncrementSnapshotEntry.getKey(),
+                                                singleIncrementSnapshotEntry.getValue());
                                     }
-                                } else {
-                                    deserializedElementStateMap.put(singleIncrementSnapshotEntry.getKey(),
-                                            singleIncrementSnapshotEntry.getValue());
                                 }
                             }
                         }
                     }
+                    if (id != null) {
+                        state.restore(deserializedStateMap);
+                        SiddhiAppContext.startPartitionFlow(id);
+                        try {
+                            stateHolder.returnState(state);
+                        } finally {
+                            SiddhiAppContext.stopPartitionFlow();
+                        }
+                        id = null;
+                        state = null;
+                        stateHolder = null;
+                        deserializedStateMap = null;
+                    }
+                }
+            } finally {
+                if (id != null && stateHolder != null && state != null) {
+                    SiddhiAppContext.startPartitionFlow(id);
+                    try {
+                        stateHolder.returnState(state);
+                    } finally {
+                        SiddhiAppContext.stopPartitionFlow();
+                    }
+                    id = null;
+                    state = null;
+                    stateHolder = null;
                 }
-                snapshotable.restoreState(deserializedElementStateMap);
             }
         }
     }
@@ -470,7 +594,7 @@ public void restoreRevision(String revision) throws CannotRestoreSiddhiAppStateE
                 incrementalSnapshotInfos.sort(new Comparator<IncrementalSnapshotInfo>() {
                     @Override
                     public int compare(IncrementalSnapshotInfo o1, IncrementalSnapshotInfo o2) {
-                        int results = o1.getElementId().compareTo(o2.getElementId());
+                        int results = o1.getId().compareTo(o2.getId());
                         if (results == 0) {
                             results = Long.compare(o2.getTime(), o1.getTime());
                             if (results == 0) {
@@ -480,13 +604,13 @@ public int compare(IncrementalSnapshotInfo o1, IncrementalSnapshotInfo o2) {
                         return results;
                     }
                 });
-                String lastElementId = null;
+                String lastId = null;
                 boolean baseFound = false;
                 boolean perioicFound = false;
                 for (Iterator<IncrementalSnapshotInfo> iterator = incrementalSnapshotInfos.iterator();
                      iterator.hasNext(); ) {
                     IncrementalSnapshotInfo snapshotInfo = iterator.next();
-                    if (snapshotInfo.getElementId().equals(lastElementId)) {
+                    if (snapshotInfo.getId().equals(lastId)) {
                         if (baseFound && (snapshotInfo.getType() == IncrementalSnapshotInfo.SnapshotType.BASE
                                 || snapshotInfo.getType() == IncrementalSnapshotInfo.SnapshotType.INCREMENT)) {
                             iterator.remove();
@@ -502,15 +626,15 @@ public int compare(IncrementalSnapshotInfo o1, IncrementalSnapshotInfo o2) {
                         baseFound = snapshotInfo.getType() == IncrementalSnapshotInfo.SnapshotType.BASE;
                         perioicFound = snapshotInfo.getType() == IncrementalSnapshotInfo.SnapshotType.PERIODIC;
                     }
-                    lastElementId = snapshotInfo.getElementId();
+                    lastId = snapshotInfo.getId();
                 }
                 Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>> incrementalState =
                         new HashMap<>();
                 for (IncrementalSnapshotInfo snapshotInfo : incrementalSnapshotInfos) {
-                    Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> incrementalStateByElementId =
-                            incrementalState.computeIfAbsent(snapshotInfo.getQueryName(), k -> new TreeMap<>());
+                    Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> incrementalStateByPartitionKey =
+                            incrementalState.computeIfAbsent(snapshotInfo.getPartitionId(), k -> new TreeMap<>());
                     Map<Long, Map<IncrementalSnapshotInfo, byte[]>> incrementalStateByTime =
-                            incrementalStateByElementId.computeIfAbsent(snapshotInfo.getElementId(),
+                            incrementalStateByPartitionKey.computeIfAbsent(snapshotInfo.getPartitionKey(),
                                     k -> new TreeMap<>());
                     Map<IncrementalSnapshotInfo, byte[]> incrementalStateByInfo = incrementalStateByTime.
                             computeIfAbsent(snapshotInfo.getTime(), k -> new HashMap<>());
@@ -568,5 +692,30 @@ public void clearAllRevisions() throws CannotClearSiddhiAppStateException {
         }
     }
 
+    class PartitionIdStateHolder {
+        private final String partitionId;
+        private final Map<String, ElementStateHolder> queryStateHolderMap = new HashMap<>();
 
+        public PartitionIdStateHolder(String partitionId) {
+            this.partitionId = partitionId;
+        }
+
+        public void addElementState(String queryName, ElementStateHolder elementStateHolder) {
+            queryStateHolderMap.put(queryName, elementStateHolder);
+        }
+
+        public ElementStateHolder getElementState(String queryName) {
+            return queryStateHolderMap.get(queryName);
+        }
+    }
+
+    class ElementStateHolder {
+        private final String elementId;
+        private final Map<String, StateHolder> elementHolderMap;
+
+        public ElementStateHolder(String elementId, Map<String, StateHolder> elementHolderMap) {
+            this.elementId = elementId;
+            this.elementHolderMap = elementHolderMap;
+        }
+    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/Snapshotable.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/Snapshotable.java
deleted file mode 100644
index eeb14950ec..0000000000
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/Snapshotable.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.core.util.snapshot;
-
-import java.util.Map;
-
-/**
- * Parent interface which should be implemented by every processing elements of Siddhi event processing chain so
- * that they can save the current state and poll for previous state in case of an issue.
- */
-public interface Snapshotable {
-
-    /**
-     * Used to collect the serializable state of the processing element, that need to be
-     * persisted for the reconstructing the element to the same state on a different point of time
-     *
-     * @return stateful objects of the processing element as an array
-     */
-    Map<String, Object> currentState();
-
-    /**
-     * Used to restore serialized state of the processing element, for reconstructing
-     * the element to the same state as if was on a previous point of time.
-     *
-     * @param state the stateful objects of the element as an array on
-     *              the same order provided by currentState().
-     */
-    void restoreState(Map<String, Object> state);
-
-    String getElementId();
-
-    /**
-     * Used to clean its references
-     */
-    void clean();
-}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
new file mode 100644
index 0000000000..fe695b9617
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.util.snapshot.state;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * State holder for non partition use case
+ */
+public class EmptyStateHolder implements StateHolder {
+
+    @Override
+    public State getState() {
+        return null;
+    }
+
+    @Override
+    public void returnState(State state) {
+    }
+
+    @Override
+    public Map<String, State> getAllStates() {
+        return new HashMap<>(0);
+    }
+
+    @Override
+    public void returnStates(Map partitionKeyStates) {
+
+    }
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
index 93ee2d77aa..a6e52d9ae9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
@@ -18,12 +18,19 @@
 
 package io.siddhi.core.util.snapshot.state;
 
-import io.siddhi.core.partition.PartitionRuntime;
+import io.siddhi.core.config.SiddhiAppContext;
+import io.siddhi.core.exception.SiddhiAppRuntimeException;
+import org.apache.log4j.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
+/**
+ * State holder for  partitioned use case
+ */
 public class PartitionStateHolder implements StateHolder {
+    private static final Logger log = Logger.getLogger(PartitionStateHolder.class);
 
     private StateFactory stateFactory;
     private Map<String, State> states = new HashMap<>();
@@ -33,23 +40,63 @@ public PartitionStateHolder(StateFactory stateFactory) {
     }
 
     @Override
-    public State getState() {
-        String key = PartitionRuntime.partitionKey.get();
+    public synchronized State getState() {
+        String key = SiddhiAppContext.getCurrentFlowId();
         State state = states.get(key);
         if (state == null) {
             state = stateFactory.createNewState();
             states.put(key, state);
         }
+        state.activeUseCount++;
         return state;
     }
 
     @Override
-    public void returnState(State state) {
-        String key = PartitionRuntime.partitionKey.get();
-        if (state.canDestroy()) {
+    public synchronized void returnState(State state) {
+        String key = SiddhiAppContext.getCurrentFlowId();
+        state.activeUseCount--;
+        if (state.activeUseCount < 0) {
+            throw new SiddhiAppRuntimeException("State active count has reached less then zero for partition key '" +
+                    key + "', current value is " + state.activeUseCount);
+        }
+        try {
+
+            if (state.activeUseCount == 0 && state.canDestroy()) {
+                states.remove(key);
+            }
+        } catch (Throwable t) {
+            log.error("Dropping partition state '" + key + "' due to error! " + t.getMessage(), t);
             states.remove(key);
         }
     }
 
+    public synchronized Map<String, State> getAllStates() {
+        for (Map.Entry<String, State> entry : states.entrySet()) {
+            entry.getValue().activeUseCount++;
+        }
+        return new HashMap<>(states);
+    }
+
+    @Override
+    public synchronized void returnStates(Map states) {
+        for (Map.Entry<String, State> entry : (Set<Map.Entry<String, State>>) states.entrySet()) {
+            entry.getValue().activeUseCount--;
+            if (entry.getValue().activeUseCount < 0) {
+                throw new SiddhiAppRuntimeException("State active count has reached less then zero for partition key '"
+                        + entry.getKey() + "', current value is " + entry.getValue().activeUseCount);
+            }
+            String key = entry.getKey();
+            try {
+                if (entry.getValue().activeUseCount == 0 && entry.getValue().canDestroy()) {
+                    this.states.remove(key);
+                }
+            } catch (Throwable t) {
+                log.error("Dropping partition state '" + key + "' due to error! " + t.getMessage(), t);
+                this.states.remove(key);
+            }
+
+        }
+    }
+
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
index 03a5fa6c1d..1bdeb60e68 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
@@ -18,20 +18,80 @@
 
 package io.siddhi.core.util.snapshot.state;
 
+import io.siddhi.core.exception.SiddhiAppRuntimeException;
+import org.apache.log4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * State holder for non partition use case
+ */
 public class SingleStateHolder implements StateHolder {
+    private static final Logger log = Logger.getLogger(SingleStateHolder.class);
 
-    private State state;
+    private final StateFactory stateFactory;
+    private State state = null;
 
     public SingleStateHolder(StateFactory stateFactory) {
-        state = stateFactory.createNewState();
+        this.stateFactory = stateFactory;
     }
 
     @Override
-    public State getState() {
+    public synchronized State getState() {
+        if (state == null) {
+            state = stateFactory.createNewState();
+        }
+        state.activeUseCount++;
         return state;
     }
 
     @Override
-    public void returnState(State state) {
+    public synchronized void returnState(State state) {
+        state.activeUseCount--;
+        if (state.activeUseCount < 0) {
+            throw new SiddhiAppRuntimeException("State active count has reached less then zero, current value is "
+                    + state.activeUseCount);
+        }
+        try {
+            if (state.activeUseCount == 0 && state.canDestroy()) {
+                this.state = null;
+            }
+        } catch (Throwable t) {
+            log.error("Dropping state due to error! " + t.getMessage(), t);
+            this.state = null;
+        }
+
+    }
+
+    public synchronized Map<String, State> getAllStates() {
+        if (state == null) {
+            state = stateFactory.createNewState();
+        }
+        Map<String, State> result = new HashMap<>(1);
+        result.put(null, state);
+        state.activeUseCount++;
+        return result;
+    }
+
+    @Override
+    public synchronized void returnStates(Map states) {
+        for (Map.Entry<String, State> entry : (Set<Map.Entry<String, State>>) states.entrySet()) {
+            entry.getValue().activeUseCount--;
+            if (entry.getValue().activeUseCount < 0) {
+                throw new SiddhiAppRuntimeException("State active count has reached less then zero, current value is "
+                        + entry.getValue().activeUseCount);
+            }
+            try {
+                if (entry.getValue().activeUseCount == 0 && entry.getValue().canDestroy()) {
+                    this.state = null;
+                }
+            } catch (Throwable t) {
+                log.error("Dropping state due to error! " + t.getMessage(), t);
+                this.state = null;
+            }
+
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SnapshotState.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/Snapshot.java
similarity index 87%
rename from modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SnapshotState.java
rename to modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/Snapshot.java
index 077dd45e3c..f0b45541dc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SnapshotState.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/Snapshot.java
@@ -23,16 +23,16 @@
 /**
  * The class which encloses the state to be serialized.
  */
-public class SnapshotState implements Serializable {
+public class Snapshot implements Serializable {
     private Object state;
     private boolean isIncrementalSnapshot;
 
-    public SnapshotState(Object state) {
+    public Snapshot(Object state) {
         this.state = state;
         this.isIncrementalSnapshot = false;
     }
 
-    public SnapshotState(Object state, boolean isIncrementalSnapshot) {
+    public Snapshot(Object state, boolean isIncrementalSnapshot) {
         this.state = state;
         this.isIncrementalSnapshot = isIncrementalSnapshot;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SnapshotStateList.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SnapshotStateList.java
index 76f0bf8e6f..609fa0cc9e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SnapshotStateList.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SnapshotStateList.java
@@ -25,24 +25,24 @@
  * The class which encloses multiple snapshot states.
  */
 public class SnapshotStateList implements Serializable {
-    private TreeMap<Long, SnapshotState> snapshotStates = new TreeMap<>();
+    private TreeMap<Long, Snapshot> snapshotStates = new TreeMap<>();
 
     public SnapshotStateList() {
     }
 
-    public SnapshotStateList(TreeMap<Long, SnapshotState> snapshotStates) {
+    public SnapshotStateList(TreeMap<Long, Snapshot> snapshotStates) {
         this.snapshotStates = snapshotStates;
     }
 
-    public TreeMap<Long, SnapshotState> getSnapshotStates() {
+    public TreeMap<Long, Snapshot> getSnapshotStates() {
         return snapshotStates;
     }
 
-    public void setSnapshotStates(TreeMap<Long, SnapshotState> snapshotStates) {
+    public void setSnapshotStates(TreeMap<Long, Snapshot> snapshotStates) {
         this.snapshotStates = snapshotStates;
     }
 
-    public void putSnapshotState(Long id, SnapshotState snapshotState) {
-        this.snapshotStates.put(id, snapshotState);
+    public void putSnapshotState(Long id, Snapshot snapshot) {
+        this.snapshotStates.put(id, snapshot);
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/State.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/State.java
index ed5e20bd9e..7456b98f4c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/State.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/State.java
@@ -18,7 +18,19 @@
 
 package io.siddhi.core.util.snapshot.state;
 
-public interface State {
+import java.util.Map;
+
+/**
+ * State to hold the data
+ */
+public abstract class State {
+
+    int activeUseCount = 0;
+
+    public abstract boolean canDestroy();
+
+    public abstract Map<String, Object> snapshot();
+
+    public abstract void restore(Map<String, Object> state);
 
-    boolean canDestroy();
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateFactory.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateFactory.java
index 163c14537f..39cb582cb3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateFactory.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateFactory.java
@@ -18,7 +18,12 @@
 
 package io.siddhi.core.util.snapshot.state;
 
-public interface StateFactory {
+/**
+ * State factory that create states that are used to store query and other states
+ *
+ * @param <S> state that hold data
+ */
+public interface StateFactory<S extends State> {
 
-    State createNewState();
+    S createNewState();
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
index f95c63ec24..69a33820ac 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
@@ -18,9 +18,20 @@
 
 package io.siddhi.core.util.snapshot.state;
 
-public interface StateHolder {
+import java.util.Map;
 
-    State getState();
+/**
+ * Holder to have all the states
+ *
+ * @param <S> state
+ */
+public interface StateHolder<S extends State> {
+
+    S getState();
+
+    void returnState(S state);
+
+    Map<String, S> getAllStates();
 
-    void returnState(State state);
+    void returnStates(Map<String, S> partitionKeyStates);
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/transport/MultiClientDistributedSink.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/transport/MultiClientDistributedSink.java
index b8798bd874..aa5f893a4a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/transport/MultiClientDistributedSink.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/transport/MultiClientDistributedSink.java
@@ -33,9 +33,7 @@
 import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * This is the distributed transport to publish to multiple endpoints using client/publisher for each endpoint. There
@@ -117,39 +115,6 @@ public void destroy() {
         transports.forEach(Sink::destroy);
     }
 
-    /**
-     * Used to collect the serializable state of the processing element, that need to be
-     * persisted for the reconstructing the element to the same state on a different point of time
-     *
-     * @return stateful objects of the processing element as an array
-     */
-    @Override
-    public Map<String, Object> currentState() {
-        // No state specific to this class. But, fetching and returning state from underlying transports as it's state
-        Map<String, Object> state = new HashMap<>();
-        for (int i = 0; i < transports.size(); i++) {
-            state.put(Integer.toString(i), transports.get(i).currentState());
-        }
-        return state;
-    }
-
-    /**
-     * Used to restore serialized state of the processing element, for reconstructing
-     * the element to the same state as if was on a previous point of time.
-     *
-     * @param state the stateful objects of the element as an array on
-     *              the same order provided by currentState().
-     */
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        if (transports != null) {
-            for (int i = 0; i < transports.size(); i++) {
-                Map<String, Object> transportState = (Map<String, Object>) state.get(Integer.toString(i));
-                transports.get(i).restoreState(transportState);
-            }
-        }
-    }
-
     /**
      * Connection callback to notify DistributionStrategy about new connection initiations and failures
      */
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/transport/SingleClientDistributedSink.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/transport/SingleClientDistributedSink.java
index 69b871e4e7..e7d6fce596 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/transport/SingleClientDistributedSink.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/transport/SingleClientDistributedSink.java
@@ -35,7 +35,6 @@
 
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -128,28 +127,6 @@ public void destroy() {
         sink.destroy();
     }
 
-    /**
-     * Used to collect the serializable state of the processing element, that need to be
-     * persisted for the reconstructing the element to the same state on a different point of time
-     *
-     * @return stateful objects of the processing element as an array
-     */
-    @Override
-    public Map<String, Object> currentState() {
-        return sink.currentState();
-    }
-
-    /**
-     * Used to restore serialized state of the processing element, for reconstructing
-     * the element to the same state as if was on a previous point of time.
-     *
-     * @param state the stateful objects of the element as an array on
-     *              the same order provided by currentState().
-     */
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        sink.restoreState(state);
-    }
 
     private Set<String> findAllDynamicOptions(List<OptionHolder> destinationOptionHolders) {
         Set<String> dynamicOptions = new HashSet<>();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/window/Window.java b/modules/siddhi-core/src/main/java/io/siddhi/core/window/Window.java
index 939e5107c1..2f994b925a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/window/Window.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/window/Window.java
@@ -44,7 +44,6 @@
 import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.parser.SingleInputStreamParser;
 import io.siddhi.core.util.parser.helper.QueryParserHelper;
-import io.siddhi.core.util.snapshot.Snapshotable;
 import io.siddhi.core.util.statistics.LatencyTracker;
 import io.siddhi.core.util.statistics.MemoryCalculable;
 import io.siddhi.core.util.statistics.ThroughputTracker;
@@ -62,7 +61,7 @@
  * Window implementation of SiddhiQL.
  * It can be seen as a global Window which can be accessed from multiple queries.
  */
-public class Window implements FindableProcessor, Snapshotable, MemoryCalculable {
+public class Window implements FindableProcessor, MemoryCalculable {
 
     /**
      * WindowDefinition used to construct this window.
@@ -137,11 +136,13 @@ public Window(WindowDefinition windowDefinition, SiddhiAppContext siddhiAppConte
     /**
      * Initialize the WindowEvent table by creating {@link WindowProcessor} to handle the events.
      *
-     * @param tableMap       map of {@link Table}s
-     * @param eventWindowMap map of EventWindows
-     * @param windowName     name of the query window belongs to.
+     * @param tableMap         map of {@link Table}s
+     * @param eventWindowMap   map of EventWindows
+     * @param windowName       name of the query window belongs to.
+     * @param findToBeExecuted will find will be executed on the window.
      */
-    public void init(Map<String, Table> tableMap, Map<String, Window> eventWindowMap, String windowName) {
+    public void init(Map<String, Table> tableMap, Map<String, Window> eventWindowMap, String windowName,
+                     boolean findToBeExecuted) {
         if (this.windowProcessor != null) {
             return;
         }
@@ -164,14 +165,14 @@ public void init(Map<String, Table> tableMap, Map<String, Window> eventWindowMap
         WindowProcessor internalWindowProcessor = (WindowProcessor) SingleInputStreamParser.generateProcessor
                 (windowDefinition.getWindow(), metaStreamEvent, new ArrayList<VariableExpressionExecutor>(),
                         tableMap, false,
-                        outputExpectsExpiredEvents, siddhiQueryContext);
+                        outputExpectsExpiredEvents, findToBeExecuted, siddhiQueryContext);
         internalWindowProcessor.setStreamEventCloner(streamEventCloner);
         internalWindowProcessor.constructStreamEventPopulater(metaStreamEvent, 0);
 
         EntryValveProcessor entryValveProcessor = null;
         if (internalWindowProcessor instanceof SchedulingProcessor) {
             entryValveProcessor = new EntryValveProcessor(this.siddhiAppContext);
-            Scheduler scheduler = SchedulerParser.parse(entryValveProcessor, this.siddhiAppContext);
+            Scheduler scheduler = SchedulerParser.parse(entryValveProcessor, siddhiQueryContext);
             scheduler.init(this.lockWrapper, windowName);
             scheduler.setStreamEventPool(streamEventPool);
             ((SchedulingProcessor) internalWindowProcessor).setScheduler(scheduler);
@@ -290,43 +291,6 @@ public LockWrapper getLock() {
         return lockWrapper;
     }
 
-
-    /**
-     * Return an object array containing the internal state of the internalWindowProcessor.
-     *
-     * @return current state of the Window
-     */
-    @Override
-    public Map<String, Object> currentState() {
-        return this.internalWindowProcessor.currentState();
-    }
-
-    /**
-     * Restore the internalWindowProcessor using given state.
-     *
-     * @param state the stateful objects of the element as an array on
-     */
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        this.internalWindowProcessor.restoreState(state);
-    }
-
-
-    /**
-     * Return the elementId which may be used for snapshot creation.
-     *
-     * @return the element id of this {@link Snapshotable} object
-     */
-    @Override
-    public String getElementId() {
-        return this.internalWindowProcessor.getElementId();
-    }
-
-    @Override
-    public void clean() {
-        internalWindowProcessor.clean();
-    }
-
     public ProcessingMode getProcessingMode() {
         return internalWindowProcessor.getProcessingMode();
     }
@@ -395,14 +359,5 @@ public void setToLast(Processor processor) {
             // Do nothing
         }
 
-
-        public Processor cloneProcessor(String key) {
-            return new StreamPublishProcessor(this.outputEventType);
-        }
-
-        @Override
-        public void clean() {
-            //ignore
-        }
     }
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/ConcatFunctionExtension.java b/modules/siddhi-core/src/test/java/io/siddhi/core/ConcatFunctionExtension.java
index 74e8ea1463..22023e0865 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/ConcatFunctionExtension.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/ConcatFunctionExtension.java
@@ -22,11 +22,11 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 import io.siddhi.query.api.exception.SiddhiAppValidationException;
 
-import java.util.Map;
-
 /*
 * concat(string1, string2, ..., stringN)
 * Returns a string that is the result of concatenating two or more string values.
@@ -38,16 +38,17 @@ public class ConcatFunctionExtension extends FunctionExecutor {
     private Attribute.Type returnType = Attribute.Type.STRING;
 
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length < 2) {
             throw new SiddhiAppValidationException("str:concat() function requires at least two arguments, " +
                     "but found only " + attributeExpressionExecutors.length);
         }
+        return null;
     }
 
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         StringBuilder sb = new StringBuilder();
         for (Object aData : data) {
             if (aData != null) {
@@ -58,7 +59,7 @@ protected Object execute(Object[] data) {
     }
 
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         return data;
     }
 
@@ -67,13 +68,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        return null;    //No states
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/aggregation/Aggregation1TestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/aggregation/Aggregation1TestCase.java
index 7fd623cd64..f2765be10e 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/aggregation/Aggregation1TestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/aggregation/Aggregation1TestCase.java
@@ -162,7 +162,6 @@ public void incrementalStreamProcessorTest5() throws InterruptedException {
 
         stockStreamInputHandler.send(new Object[]{"IBM", 100f, null, 200L, 26, 1496289954000L});
         stockStreamInputHandler.send(new Object[]{"IBM", 100f, null, 200L, 96, 1496289954000L});
-        Thread.sleep(100);
 
         Event[] events = siddhiAppRuntime.query("from stockAggregation " +
                 "within \"2017-06-** **:**:**\" " +
@@ -275,8 +274,8 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
                     new Object[]{1496289950000L, "WSO2", 60.0, 240.0, 700f},
                     new Object[]{1496289951000L, "IBM", 100.0, 200.0, 9600f},
                     new Object[]{1496289952000L, "IBM", 700.0, 1400.0, 3500f},
-                    new Object[]{1496289953000L, "WSO2", 100.0, 300.0, 1540f},
                     new Object[]{1496289953000L, "IBM", 400.0, 400.0, 3600f},
+                    new Object[]{1496289953000L, "WSO2", 100.0, 300.0, 1540f},
                     new Object[]{1496289954000L, "IBM", 600.0, 600.0, 3600f},
                     new Object[]{1496290016000L, "IBM", 1000.0, 1000.0, 9000f}
             );
@@ -944,8 +943,8 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
                     new Object[]{1496289950000L, 240.0, 60.0, 700f, "WSO2", 70f, 50f},
                     new Object[]{1496289951000L, 200.0, 100.0, 9600f, "IBM", 100f, 100f},
                     new Object[]{1496289952000L, 1400.0, 700.0, 3500f, "IBM", 900f, 500f},
-                    new Object[]{1496289953000L, 300.0, 100.0, 1540f, "WSO2", 140f, 60f},
                     new Object[]{1496289953000L, 400.0, 400.0, 3600f, "IBM", 400f, 400f},
+                    new Object[]{1496289953000L, 300.0, 100.0, 1540f, "WSO2", 140f, 60f},
                     new Object[]{1496289954000L, 600.0, 600.0, 3600f, "IBM", 600f, 600f},
                     new Object[]{1496290016000L, 1000.0, 1000.0, 9000f, "IBM", 1000f, 1000f}
             );
@@ -1039,7 +1038,6 @@ public void incrementalStreamProcessorTest16() throws InterruptedException {
         try {
             // Thursday, June 1, 2017 4:05:50 AM
             stockStreamInputHandler.send(new Object[]{"WSO2", 50f, 60f, 90L, 6, "June 1, 2017 4:05:50 AM"});
-
             AssertJUnit.assertTrue(appender.getMessages().contains("'June 1, 2017 4:05:50 AM' doesn't match the " +
                     "supported formats <yyyy>-<MM>-<dd> <HH>:<mm>:<ss> (for GMT time zone) or <yyyy>-<MM>-<dd> " +
                     "<HH>:<mm>:<ss> <Z> (for non GMT time zone). The ISO 8601 UTC offset must be provided for <Z> " +
@@ -2165,8 +2163,7 @@ public void incrementalStreamProcessorTest37() throws InterruptedException {
         siddhiAppRuntime.shutdown();
     }
 
-    @Test
-    //(dependsOnMethods = {"incrementalStreamProcessorTest37"})
+    @Test(dependsOnMethods = {"incrementalStreamProcessorTest37"})
     public void incrementalStreamProcessorTest38() throws InterruptedException {
         LOG.info("incrementalStreamProcessorTest38");
         SiddhiManager siddhiManager = new SiddhiManager();
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/SnapshotableEventQueueTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/SnapshotableEventQueueTestCase.java
index 284f01280b..d7e574fcda 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/SnapshotableEventQueueTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/SnapshotableEventQueueTestCase.java
@@ -25,7 +25,7 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
 import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
-import io.siddhi.core.util.snapshot.state.SnapshotState;
+import io.siddhi.core.util.snapshot.state.Snapshot;
 import io.siddhi.core.util.snapshot.state.SnapshotStateList;
 import io.siddhi.query.api.definition.Attribute;
 import org.apache.log4j.Logger;
@@ -98,7 +98,7 @@ public void incrementalPersistenceTest1() throws InterruptedException, IOExcepti
         }
 
         HashMap<Long, String> snapshots = new HashMap<>();
-        SnapshotState snapshot1 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot1 = snapshotableStreamEventQueue.getSnapshot();
         StreamEvent streamEvents = (StreamEvent) snapshot1.getState();
         Assert.assertTrue(streamEvents != null);
         snapshots.put(3L, toString(snapshot1));
@@ -108,7 +108,7 @@ public void incrementalPersistenceTest1() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.add(streamEventCloner.copyStreamEvent(streamEvent));
         }
 
-        SnapshotState snapshot2 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot2 = snapshotableStreamEventQueue.getSnapshot();
         ArrayList<Operation> operationLog = (ArrayList<Operation>) snapshot2.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(4L, toString(snapshot2));
@@ -118,7 +118,7 @@ public void incrementalPersistenceTest1() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.add(streamEventCloner.copyStreamEvent(streamEvent));
         }
 
-        SnapshotState snapshot3 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot3 = snapshotableStreamEventQueue.getSnapshot();
         operationLog = (ArrayList<Operation>) snapshot3.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(5L, toString(snapshot3));
@@ -127,7 +127,7 @@ public void incrementalPersistenceTest1() throws InterruptedException, IOExcepti
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         SnapshotStateList snapshotStateList = new SnapshotStateList();
         for (Map.Entry<Long, String> entry : snapshots.entrySet()) {
-            snapshotStateList.putSnapshotState(entry.getKey(), (SnapshotState) fromString(entry.getValue()));
+            snapshotStateList.putSnapshotState(entry.getKey(), (Snapshot) fromString(entry.getValue()));
         }
         snapshotableStreamEventQueue2.restore(snapshotStateList);
 
@@ -138,7 +138,7 @@ public void incrementalPersistenceTest1() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.add(streamEventCloner.copyStreamEvent(streamEvent));
         }
 
-        SnapshotState snapshot4 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot4 = snapshotableStreamEventQueue.getSnapshot();
         streamEvents = (StreamEvent) snapshot1.getState();
         Assert.assertTrue(streamEvents != null);
         snapshots = new HashMap<>();
@@ -148,7 +148,7 @@ public void incrementalPersistenceTest1() throws InterruptedException, IOExcepti
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         snapshotStateList = new SnapshotStateList();
         for (Map.Entry<Long, String> entry : snapshots.entrySet()) {
-            snapshotStateList.putSnapshotState(entry.getKey(), (SnapshotState) fromString(entry.getValue()));
+            snapshotStateList.putSnapshotState(entry.getKey(), (Snapshot) fromString(entry.getValue()));
         }
         snapshotableStreamEventQueue3.restore(snapshotStateList);
 
@@ -178,7 +178,7 @@ public void incrementalPersistenceTest2() throws InterruptedException, IOExcepti
         }
 
         HashMap<Long, String> snapshots = new HashMap<>();
-        SnapshotState snapshot1 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot1 = snapshotableStreamEventQueue.getSnapshot();
         StreamEvent streamEvents = (StreamEvent) snapshot1.getState();
         Assert.assertTrue(streamEvents != null);
         snapshots.put(3L, toString(snapshot1));
@@ -188,7 +188,7 @@ public void incrementalPersistenceTest2() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.remove();
         }
 
-        SnapshotState snapshot2 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot2 = snapshotableStreamEventQueue.getSnapshot();
         ArrayList<Operation> operationLog = (ArrayList<Operation>) snapshot2.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(4L, toString(snapshot2));
@@ -198,7 +198,7 @@ public void incrementalPersistenceTest2() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.add(streamEventCloner.copyStreamEvent(streamEvent));
         }
 
-        SnapshotState snapshot3 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot3 = snapshotableStreamEventQueue.getSnapshot();
         operationLog = (ArrayList<Operation>) snapshot3.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(5L, toString(snapshot3));
@@ -207,7 +207,7 @@ public void incrementalPersistenceTest2() throws InterruptedException, IOExcepti
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         SnapshotStateList snapshotStateList = new SnapshotStateList();
         for (Map.Entry<Long, String> entry : snapshots.entrySet()) {
-            snapshotStateList.putSnapshotState(entry.getKey(), (SnapshotState) fromString(entry.getValue()));
+            snapshotStateList.putSnapshotState(entry.getKey(), (Snapshot) fromString(entry.getValue()));
         }
         snapshotableStreamEventQueue2.restore(snapshotStateList);
 
@@ -236,7 +236,7 @@ public void incrementalPersistenceTest3() throws InterruptedException, IOExcepti
         }
 
         HashMap<Long, String> snapshots = new HashMap<>();
-        SnapshotState snapshot1 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot1 = snapshotableStreamEventQueue.getSnapshot();
         StreamEvent streamEvents = (StreamEvent) snapshot1.getState();
         Assert.assertTrue(streamEvents != null);
         snapshots.put(3L, toString(snapshot1));
@@ -250,7 +250,7 @@ public void incrementalPersistenceTest3() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.remove();
         }
 
-        SnapshotState snapshot2 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot2 = snapshotableStreamEventQueue.getSnapshot();
         ArrayList<Operation> operationLog = (ArrayList<Operation>) snapshot2.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(4L, toString(snapshot2));
@@ -260,7 +260,7 @@ public void incrementalPersistenceTest3() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.add(streamEventCloner.copyStreamEvent(streamEvent));
         }
 
-        SnapshotState snapshot3 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot3 = snapshotableStreamEventQueue.getSnapshot();
         operationLog = (ArrayList<Operation>) snapshot3.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(5L, toString(snapshot3));
@@ -269,7 +269,7 @@ public void incrementalPersistenceTest3() throws InterruptedException, IOExcepti
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         SnapshotStateList snapshotStateList = new SnapshotStateList();
         for (Map.Entry<Long, String> entry : snapshots.entrySet()) {
-            snapshotStateList.putSnapshotState(entry.getKey(), (SnapshotState) fromString(entry.getValue()));
+            snapshotStateList.putSnapshotState(entry.getKey(), (Snapshot) fromString(entry.getValue()));
         }
         snapshotableStreamEventQueue2.restore(snapshotStateList);
         Assert.assertEquals(snapshotableStreamEventQueue, snapshotableStreamEventQueue2);
@@ -297,7 +297,7 @@ public void incrementalPersistenceTest4() throws InterruptedException, IOExcepti
         }
 
         HashMap<Long, String> snapshots = new HashMap<>();
-        SnapshotState snapshot1 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot1 = snapshotableStreamEventQueue.getSnapshot();
         StreamEvent streamEvents = (StreamEvent) snapshot1.getState();
         Assert.assertTrue(streamEvents != null);
         snapshots.put(3L, toString(snapshot1));
@@ -313,7 +313,7 @@ public void incrementalPersistenceTest4() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.poll();
         }
 
-        SnapshotState snapshot2 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot2 = snapshotableStreamEventQueue.getSnapshot();
         ArrayList<Operation> operationLog = (ArrayList<Operation>) snapshot2.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(4L, toString(snapshot2));
@@ -323,7 +323,7 @@ public void incrementalPersistenceTest4() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.add(streamEventCloner.copyStreamEvent(streamEvent));
         }
 
-        SnapshotState snapshot3 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot3 = snapshotableStreamEventQueue.getSnapshot();
         operationLog = (ArrayList<Operation>) snapshot3.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(5L, toString(snapshot3));
@@ -332,7 +332,7 @@ public void incrementalPersistenceTest4() throws InterruptedException, IOExcepti
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         SnapshotStateList snapshotStateList = new SnapshotStateList();
         for (Map.Entry<Long, String> entry : snapshots.entrySet()) {
-            snapshotStateList.putSnapshotState(entry.getKey(), (SnapshotState) fromString(entry.getValue()));
+            snapshotStateList.putSnapshotState(entry.getKey(), (Snapshot) fromString(entry.getValue()));
         }
         snapshotableStreamEventQueue2.restore(snapshotStateList);
         Assert.assertEquals(snapshotableStreamEventQueue, snapshotableStreamEventQueue2);
@@ -360,7 +360,7 @@ public void incrementalPersistenceTest5() throws InterruptedException, IOExcepti
         }
 
         HashMap<Long, String> snapshots = new HashMap<>();
-        SnapshotState snapshot1 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot1 = snapshotableStreamEventQueue.getSnapshot();
         StreamEvent streamEvents = (StreamEvent) snapshot1.getState();
         Assert.assertTrue(streamEvents != null);
         snapshots.put(3L, toString(snapshot1));
@@ -375,7 +375,7 @@ public void incrementalPersistenceTest5() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.overwrite(streamEventCloner.copyStreamEvent(streamEvent));
         }
 
-        SnapshotState snapshot2 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot2 = snapshotableStreamEventQueue.getSnapshot();
         ArrayList<Operation> operationLog = (ArrayList<Operation>) snapshot2.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(4L, toString(snapshot2));
@@ -385,7 +385,7 @@ public void incrementalPersistenceTest5() throws InterruptedException, IOExcepti
             snapshotableStreamEventQueue.add(streamEventCloner.copyStreamEvent(streamEvent));
         }
 
-        SnapshotState snapshot3 = snapshotableStreamEventQueue.getSnapshot();
+        Snapshot snapshot3 = snapshotableStreamEventQueue.getSnapshot();
         operationLog = (ArrayList<Operation>) snapshot3.getState();
         Assert.assertTrue(operationLog != null);
         snapshots.put(5L, toString(snapshot3));
@@ -394,7 +394,7 @@ public void incrementalPersistenceTest5() throws InterruptedException, IOExcepti
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         SnapshotStateList snapshotStateList = new SnapshotStateList();
         for (Map.Entry<Long, String> entry : snapshots.entrySet()) {
-            snapshotStateList.putSnapshotState(entry.getKey(), (SnapshotState) fromString(entry.getValue()));
+            snapshotStateList.putSnapshotState(entry.getKey(), (Snapshot) fromString(entry.getValue()));
         }
         snapshotableStreamEventQueue2.restore(snapshotStateList);
         Assert.assertEquals(snapshotableStreamEventQueue, snapshotableStreamEventQueue2);
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/FilterTestCase2.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/FilterTestCase2.java
index f316aaf781..f8be03dc6a 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/FilterTestCase2.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/FilterTestCase2.java
@@ -1595,8 +1595,11 @@ public void filterTest120() throws InterruptedException {
         SiddhiManager siddhiManager = new SiddhiManager();
 
         String cseEventStream = "define stream cseEventStream (symbol string, price float, volume long);";
-        String query = "@info(name = 'query1') from cseEventStream select symbol,sum(price) as sumprice group by " +
-                "symbol having sumprice > 880 insert into outputStream ;";
+        String query = "@info(name = 'query1') " +
+                "from cseEventStream " +
+                "select symbol, sum(price) as sumprice " +
+                "group by symbol " +
+                "having sumprice > 880 insert into outputStream ;";
         SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(cseEventStream + query);
 
         siddhiAppRuntime.addCallback("query1", new QueryCallback() {
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/ExtensionTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/ExtensionTestCase.java
index a3f65e7fbf..727c08e8b8 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/ExtensionTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/ExtensionTestCase.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.SiddhiManager;
 import io.siddhi.core.event.Event;
 import io.siddhi.core.query.extension.util.CustomFunctionExtension;
-import io.siddhi.core.query.extension.util.StringConcatAggregatorString;
+import io.siddhi.core.query.extension.util.StringConcatAggregatorExecutorString;
 import io.siddhi.core.query.output.callback.QueryCallback;
 import io.siddhi.core.stream.input.InputHandler;
 import io.siddhi.core.util.EventPrinter;
@@ -85,7 +85,7 @@ public void extensionTest2() throws InterruptedException, ClassNotFoundException
         log.info("extension test2");
         SiddhiManager siddhiManager = new SiddhiManager();
         siddhiManager.setExtension("custom:plus", CustomFunctionExtension.class);
-        siddhiManager.setExtension("email:getAll", StringConcatAggregatorString.class);
+        siddhiManager.setExtension("email:getAll", StringConcatAggregatorExecutorString.class);
 
         String cseEventStream = "define stream cseEventStream (symbol string, price long, volume long);";
         String query = ("@info(name = 'query1') from cseEventStream select symbol , custom:plus(price,volume) as " +
@@ -128,7 +128,7 @@ public void extensionTest3() throws InterruptedException {
         log.info("extension test3");
         SiddhiManager siddhiManager = new SiddhiManager();
         siddhiManager.setExtension("custom:plus", CustomFunctionExtension.class);
-        siddhiManager.setExtension("email:getAllNew", StringConcatAggregatorString.class);
+        siddhiManager.setExtension("email:getAllNew", StringConcatAggregatorExecutorString.class);
 
         String cseEventStream = "" +
                 "" +
@@ -172,7 +172,7 @@ public void extensionTest4() throws InterruptedException, ClassNotFoundException
         log.info("extension test4");
         SiddhiManager siddhiManager = new SiddhiManager();
         siddhiManager.setExtension("custom:plus", CustomFunctionExtension.class);
-        siddhiManager.setExtension("email:getAll", StringConcatAggregatorString.class);
+        siddhiManager.setExtension("email:getAll", StringConcatAggregatorExecutorString.class);
 
 
         String cseEventStream = "define stream cseEventStream (price long, volume long);";
@@ -218,7 +218,7 @@ public void extensionTest5() throws InterruptedException, ClassNotFoundException
         configMap.put("email.getAllNew.append.abc", "true");
         siddhiManager.setConfigManager(new InMemoryConfigManager(configMap, null));
         siddhiManager.setExtension("custom:plus", CustomFunctionExtension.class);
-        siddhiManager.setExtension("email:getAllNew", StringConcatAggregatorString.class);
+        siddhiManager.setExtension("email:getAllNew", StringConcatAggregatorExecutorString.class);
 
         String cseEventStream = "" +
                 "" +
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/CustomFunctionExtension.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/CustomFunctionExtension.java
index 8bef895603..4f812672f7 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/CustomFunctionExtension.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/CustomFunctionExtension.java
@@ -27,10 +27,10 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
-import java.util.Map;
-
 @Extension(
         name = "plus",
         namespace = "custom",
@@ -55,9 +55,9 @@ public class CustomFunctionExtension extends FunctionExecutor {
     private Attribute.Type returnType;
 
     @Override
-    public void init(ExpressionExecutor[] attributeExpressionExecutors,
-                     ConfigReader configReader,
-                     SiddhiQueryContext siddhiQueryContext) {
+    public StateFactory init(ExpressionExecutor[] attributeExpressionExecutors,
+                             ConfigReader configReader,
+                             SiddhiQueryContext siddhiQueryContext) {
         for (ExpressionExecutor expressionExecutor : attributeExpressionExecutors) {
             Attribute.Type attributeType = expressionExecutor.getReturnType();
             if (attributeType == Attribute.Type.DOUBLE) {
@@ -69,7 +69,7 @@ public void init(ExpressionExecutor[] attributeExpressionExecutors,
                 returnType = Attribute.Type.LONG;
             }
         }
-
+        return null;
     }
 
     /**
@@ -84,7 +84,7 @@ public Attribute.Type getReturnType() {
 
 
     @Override
-    protected Object execute(Object[] obj) {
+    protected Object execute(Object[] obj, State state) {
         if (returnType == Attribute.Type.DOUBLE) {
             double total = 0;
             for (Object aObj : obj) {
@@ -103,7 +103,7 @@ protected Object execute(Object[] obj) {
     }
 
     @Override
-    protected Object execute(Object obj) {
+    protected Object execute(Object obj, State state) {
         if (returnType == Attribute.Type.DOUBLE) {
             double total = 0;
             if (obj instanceof Object[]) {
@@ -123,14 +123,4 @@ protected Object execute(Object obj) {
         }
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        //No state
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/StringConcatAggregatorString.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/StringConcatAggregatorExecutorString.java
similarity index 55%
rename from modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/StringConcatAggregatorString.java
rename to modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/StringConcatAggregatorExecutorString.java
index 431b1a5bf4..ffae47a80d 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/StringConcatAggregatorString.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/extension/util/StringConcatAggregatorExecutorString.java
@@ -26,8 +26,10 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.ProcessingMode;
-import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator;
+import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregatorExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute.Type;
 
 import java.util.HashMap;
@@ -52,9 +54,9 @@
                 description = "This will concatenate given input values and return 'hello world'."
         )
 )
-public class StringConcatAggregatorString extends AttributeAggregator {
+public class StringConcatAggregatorExecutorString extends
+        AttributeAggregatorExecutor<StringConcatAggregatorExecutorString.ExecutorState> {
     private static final long serialVersionUID = 1358667438272544590L;
-    private String aggregatedStringValue = "";
     private boolean appendAbc = false;
 
     /**
@@ -63,15 +65,17 @@ public class StringConcatAggregatorString extends AttributeAggregator {
      * @param attributeExpressionExecutors are the executors of each attributes in the function
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
-     * @param configReader                 this hold the {@link StringConcatAggregatorString} configuration reader.
+     * @param configReader                 this hold the {@link StringConcatAggregatorExecutorString}
+     *                                     configuration reader.
      * @param siddhiQueryContext           current siddhi query context
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ProcessingMode processingMode,
-                        boolean outputExpectsExpiredEvents, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory<ExecutorState> init(ExpressionExecutor[] attributeExpressionExecutors,
+                                               ProcessingMode processingMode,
+                                               boolean outputExpectsExpiredEvents, ConfigReader configReader,
+                                               SiddhiQueryContext siddhiQueryContext) {
         appendAbc = Boolean.parseBoolean(configReader.readConfig("append.abc", "false"));
-
+        return () -> new ExecutorState();
     }
 
     @Override
@@ -81,70 +85,75 @@ public Type getReturnType() {
 
 
     @Override
-    public Object processAdd(Object data) {
-        aggregatedStringValue = aggregatedStringValue + data;
+    public Object processAdd(Object data, ExecutorState state) {
+        state.aggregatedStringValue = state.aggregatedStringValue + data;
         if (appendAbc) {
-            return aggregatedStringValue + "-abc";
+            return state.aggregatedStringValue + "-abc";
         } else {
-            return aggregatedStringValue;
+            return state.aggregatedStringValue;
         }
     }
 
     @Override
-    public Object processAdd(Object[] data) {
+    public Object processAdd(Object[] data, ExecutorState state) {
         for (Object aData : data) {
-            aggregatedStringValue = aggregatedStringValue + aData;
+            state.aggregatedStringValue = state.aggregatedStringValue + aData;
         }
         if (appendAbc) {
-            return aggregatedStringValue + "-abc";
+            return state.aggregatedStringValue + "-abc";
         } else {
-            return aggregatedStringValue;
+            return state.aggregatedStringValue;
         }
     }
 
 
     @Override
-    public Object processRemove(Object data) {
-        aggregatedStringValue = aggregatedStringValue.replaceFirst(data.toString(), "");
+    public Object processRemove(Object data, ExecutorState state) {
+        state.aggregatedStringValue = state.aggregatedStringValue.replaceFirst(data.toString(), "");
         if (appendAbc) {
-            return aggregatedStringValue + "-abc";
+            return state.aggregatedStringValue + "-abc";
         } else {
-            return aggregatedStringValue;
+            return state.aggregatedStringValue;
         }
     }
 
     @Override
-    public Object processRemove(Object[] data) {
+    public Object processRemove(Object[] data, ExecutorState state) {
         for (Object aData : data) {
-            aggregatedStringValue = aggregatedStringValue.replaceFirst(aData.toString(), "");
+            state.aggregatedStringValue = state.aggregatedStringValue.replaceFirst(aData.toString(), "");
         }
         if (appendAbc) {
-            return aggregatedStringValue + "-abc";
+            return state.aggregatedStringValue + "-abc";
         } else {
-            return aggregatedStringValue;
+            return state.aggregatedStringValue;
         }
     }
 
     @Override
-    public boolean canDestroy() {
-        return aggregatedStringValue != null && aggregatedStringValue.equals("");
+    public Object reset(ExecutorState state) {
+        state.aggregatedStringValue = "";
+        return state.aggregatedStringValue;
     }
 
-    @Override
-    public Object reset() {
-        aggregatedStringValue = "";
-        return aggregatedStringValue;
-    }
 
-    @Override
-    public Map<String, Object> currentState() {
-        Map<String, Object> state = new HashMap<>();
-        state.put("AggregatedStringValue", aggregatedStringValue);
-        return state;
-    }
+    class ExecutorState extends State {
+        private String aggregatedStringValue = "";
 
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        aggregatedStringValue = (String) state.get("AggregatedStringValue");
+        @Override
+        public boolean canDestroy() {
+            return aggregatedStringValue != null && aggregatedStringValue.equals("");
+        }
+
+        @Override
+        public Map<String, Object> snapshot() {
+            Map<String, Object> state = new HashMap<>();
+            state.put("AggregatedStringValue", aggregatedStringValue);
+            return state;
+        }
+
+        @Override
+        public void restore(Map<String, Object> state) {
+            aggregatedStringValue = (String) state.get("AggregatedStringValue");
+        }
     }
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/JoinPartitionTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/JoinPartitionTestCase.java
index a7f53d0c3a..96619aff0b 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/JoinPartitionTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/JoinPartitionTestCase.java
@@ -83,21 +83,25 @@ public void receive(Event[] events) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testJoinPartition1")
     public void testJoinPartition2() throws InterruptedException {
         log.info("Join partition test2");
 
         SiddhiManager siddhiManager = new SiddhiManager();
 
-        String siddhiApp = "define stream cseEventStream (symbol string, user string,volume int);  define stream " +
-                "twitterStream (user string, tweet string, company string);"
-                + "partition with (user of cseEventStream, user of twitterStream) begin @info(name = 'query1') " +
-                "from cseEventStream#window.time(1 sec) join twitterStream#window.time(1 sec) " +
-                "on cseEventStream.symbol== twitterStream.company " +
-                "select cseEventStream.symbol as symbol, cseEventStream.user as user,twitterStream.tweet, " +
-                "cseEventStream.volume " +
-                "insert all events into outputStream ;" + "" +
-                "end ";
+        String siddhiApp = "" +
+                "define stream cseEventStream (symbol string, user string,volume int); " +
+                "define stream twitterStream (user string, tweet string, company string); " +
+                "partition with (user of cseEventStream, user of twitterStream) " +
+                "begin " +
+                "   @info(name = 'query1') " +
+                "   from cseEventStream#window.time(1 sec) join twitterStream#window.time(1 sec) " +
+                "       on cseEventStream.symbol== twitterStream.company " +
+                "   select cseEventStream.symbol as symbol, cseEventStream.user as user,twitterStream.tweet, " +
+                "       cseEventStream.volume " +
+                "   insert all events into outputStream ;" +
+                "end " +
+                "";
 
 
         SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
@@ -129,21 +133,28 @@ public void receive(Event[] events) {
     }
 
 
-    @Test
+    @Test(dependsOnMethods = "testJoinPartition2")
     public void testJoinPartition3() throws InterruptedException {
         log.info("Join partition test3");
 
         SiddhiManager siddhiManager = new SiddhiManager();
 
-        String siddhiApp = "define stream cseEventStream (symbol string, user string,volume int);  define stream " +
-                "twitterStream (user string, tweet string, company string);"
-                + "partition with (user of cseEventStream, user of twitterStream) begin @info(name = 'query1') " +
-                "from cseEventStream#window.time(1 sec) join twitterStream#window.time(1 sec) " +
-                "on cseEventStream.symbol== twitterStream.company " +
-                "select cseEventStream.symbol as symbol, cseEventStream.user as user,twitterStream.tweet, " +
-                "cseEventStream.volume " +
-                "insert all events into #outputStream ;" +
-                "@info(name = 'query2') from #outputStream select symbol,user insert all events into outStream;" +
+        String siddhiApp = "" +
+                "define stream cseEventStream (symbol string, user string,volume int);  " +
+                "define stream twitterStream (user string, tweet string, company string);"                +
+                "partition with (user of cseEventStream, user of twitterStream) " +
+                "begin " +
+                "   @info(name = 'query1') " +
+                "   from cseEventStream#window.time(1 sec) join twitterStream#window.time(1 sec) " +
+                "       on cseEventStream.symbol== twitterStream.company " +
+                "   select cseEventStream.symbol as symbol, cseEventStream.user as user,twitterStream.tweet, " +
+                "       cseEventStream.volume " +
+                "   insert all events into #outputStream ;" +
+                "" +
+                "   @info(name = 'query2') " +
+                "   from #outputStream " +
+                "   select symbol,user " +
+                "   insert all events into outStream;" +
                 "end ";
 
 
@@ -167,17 +178,16 @@ public void receive(Event[] events) {
 
         cseEventStreamHandler.send(new Object[]{"IBM", "User2", 100});
         twitterStreamHandler.send(new Object[]{"User2", "Hello World", "IBM"});
-
         twitterStreamHandler.send(new Object[]{"User2", "World", "IBM"});
 
-        SiddhiTestHelper.waitForEvents(100, 8, count, 6000);
+        SiddhiTestHelper.waitForEvents(200, 8, count, 6000);
         AssertJUnit.assertEquals(8, count.get());
         AssertJUnit.assertTrue(eventArrived);
         siddhiAppRuntime.shutdown();
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testJoinPartition3")
     public void testJoinPartition4() throws InterruptedException {
         log.info("Join partition test4");
 
@@ -229,7 +239,7 @@ public void receive(Event[] events) {
 
     }
 
-    @Test
+    @Test//(dependsOnMethods = "testJoinPartition4")
     public void testJoinPartition5() throws InterruptedException {
         log.info("Join partition test5");
 
@@ -281,7 +291,7 @@ public void receive(Event[] events) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testJoinPartition5")
     public void testJoinPartition6() throws InterruptedException {
         log.info("Join partition test6");
 
@@ -328,7 +338,7 @@ public void receive(Event[] events) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testJoinPartition6")
     public void testJoinPartition7() throws InterruptedException {
         log.info("Join partition test7");
 
@@ -377,7 +387,7 @@ public void receive(Event[] events) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testJoinPartition7")
     public void testJoinPartition8() throws InterruptedException {
         log.info("Join partition test8");
 
@@ -419,7 +429,7 @@ public void receive(Event[] events) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testJoinPartition8")
     public void testJoinPartition9() throws InterruptedException {
         log.info("Join partition test9");
 
@@ -467,7 +477,7 @@ public void receive(Event[] events) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testJoinPartition9")
     public void testJoinPartition10() throws InterruptedException {
         log.info("Join partition test10");
 
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionTestCase1.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionTestCase1.java
index 1862df8efa..def0b81aad 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionTestCase1.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionTestCase1.java
@@ -66,8 +66,10 @@ public void testPartitionQuery() throws InterruptedException {
                 "define stream streamA (symbol string, price int);" +
                 "partition with (symbol of streamA) " +
                 "begin " +
-                "@info(name = 'query1') " +
-                "from streamA select symbol,price insert into StockQuote ;  " +
+                "   @info(name = 'query1') " +
+                "   from streamA " +
+                "   select symbol, price " +
+                "   insert into StockQuote ;  " +
                 "end ";
 
         SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
@@ -816,20 +818,48 @@ public void testPartitionQuery15() throws InterruptedException {
         log.info("Partition test15");
         SiddhiManager siddhiManager = new SiddhiManager();
 
-        String siddhiApp = "@app:name('PartitionTest15') " +
-                "define stream cseEventStream (symbol string, price float,volume int);"
-                + "define stream cseEventStream1 (symbol string, price float,volume int);"
-                + "define stream StockStream (symbol string, price float,volume int);"
-                + "partition with (symbol of cseEventStream) begin @info(name = 'query') from cseEventStream select " +
-                "symbol,price as price,volume insert into #StockStream ;"
-                + "@info(name = 'query1') from #StockStream select symbol,price,volume insert into OutStockStream ;"
-                + "@info(name = 'query2') from #StockStream select symbol,price,volume insert into StockStream ; end ;"
-                + "partition with (symbol of cseEventStream1) begin @info(name = 'query3') from cseEventStream1 " +
-                "select symbol,price+5 as price,volume insert into #StockStream ;"
-                + "@info(name = 'query4') from #StockStream select symbol,price,volume insert into OutStockStream ; " +
-                "end ;"
-                + "@info(name = 'query5') from StockStream select symbol,price+15  as price,volume group by symbol " +
-                "insert into OutStockStream ;";
+        String siddhiApp = "" +
+                "@app:name('PartitionTest15') " +
+                "define stream cseEventStream (symbol string, price float,volume int);" +
+                "define stream cseEventStream1 (symbol string, price float,volume int);" +
+                "define stream StockStream (symbol string, price float,volume int);" +
+                "partition with (symbol of cseEventStream) " +
+                "begin " +
+                "   @info(name = 'query') " +
+                "   from cseEventStream " +
+                "   select symbol,price as price,volume " +
+                "   insert into #StockStream ;" +
+                "   " +
+                "   @info(name = 'query1') " +
+                "   from #StockStream " +
+                "   select symbol,price,volume " +
+                "   insert into OutStockStream ;" +
+                "" +
+                "   @info(name = 'query2') " +
+                "   from #StockStream " +
+                "   select symbol,price,volume " +
+                "   insert into StockStream ; " +
+                "end ;" +
+                "" +
+                "partition with (symbol of cseEventStream1) " +
+                "begin " +
+                "   @info(name = 'query3') " +
+                "   from cseEventStream1 " +
+                "   select symbol, price + 5 as price, volume " +
+                "   insert into #StockStream ;" +
+                "" +
+                "   @info(name = 'query4') " +
+                "   from #StockStream " +
+                "   select symbol,price,volume " +
+                "   insert into OutStockStream ; " +
+                "end ;" +
+                "" +
+                "@info(name = 'query5') " +
+                "from StockStream " +
+                "select symbol,price+15 as price,volume " +
+                "group by symbol " +
+                "insert into OutStockStream ;" +
+                "";
 
         SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
 
@@ -1463,12 +1493,15 @@ public void testPartitionQuery27() throws InterruptedException {
                 "define stream streamB (symbol string,  price int); " +
                 "partition with (symbol of streamA,  symbol of streamB) " +
                 "begin " +
-                "@info(name = 'query1') " +
-                "from streamA  " +
-                "select symbol, price insert into StockQuote ;  " +
-                "@info(name = 'query2') " +
-                "from streamB  " +
-                "select symbol, price insert into StockQuote ;  " +
+                "   @info(name = 'query1') " +
+                "   from streamA  " +
+                "   select symbol, price " +
+                "   insert into StockQuote ;  " +
+                "" +
+                "   @info(name = 'query2') " +
+                "   from streamB  " +
+                "   select symbol, price " +
+                "   insert into StockQuote ;  " +
                 "end ";
 
         SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
index 4e50f3cda7..dab2325ee8 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
@@ -863,7 +863,7 @@ public void receive(Event[] events) {
         inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4", "WSO2"});
         Thread.sleep(1100);
         inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.30", "WSO2"});
-        Thread.sleep(1000);
+        Thread.sleep(1100);
 
         AssertJUnit.assertEquals("Event arrived", true, eventArrived.get());
         AssertJUnit.assertTrue("Number of output event value", 3 == count.get());
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutorTestCase.java
similarity index 97%
rename from modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorTestCase.java
rename to modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutorTestCase.java
index c5b7ccdaf0..787240e12e 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutorTestCase.java
@@ -28,8 +28,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-public class DistinctCountAttributeAggregatorTestCase {
-    private static final Logger log = Logger.getLogger(DistinctCountAttributeAggregatorTestCase.class);
+public class DistinctCountAttributeAggregatorExecutorTestCase {
+    private static final Logger log = Logger.getLogger(DistinctCountAttributeAggregatorExecutorTestCase.class);
     private volatile int count;
 
     @BeforeMethod
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorExecutorTestCase.java
similarity index 99%
rename from modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorTestCase.java
rename to modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorExecutorTestCase.java
index 18b2d803c5..5027ece817 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/selector/attribute/aggregator/StdDevAttributeAggregatorExecutorTestCase.java
@@ -29,8 +29,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-public class StdDevAttributeAggregatorTestCase {
-    private static final Logger log = Logger.getLogger(StdDevAttributeAggregatorTestCase.class);
+public class StdDevAttributeAggregatorExecutorTestCase {
+    private static final Logger log = Logger.getLogger(StdDevAttributeAggregatorExecutorTestCase.class);
     private final double epsilon = 0.00001; // difference threshold for two doubles to be treated distinct
     private int inEventCount; // Only used in the Test #1 and #6
 
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/streamfunction/AttributeStreamFunction.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/streamfunction/AttributeStreamFunction.java
index 027ac614cc..3be31cf8b1 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/streamfunction/AttributeStreamFunction.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/streamfunction/AttributeStreamFunction.java
@@ -24,14 +24,16 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.processor.stream.function.StreamFunctionProcessor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.AbstractDefinition;
 import io.siddhi.query.api.definition.Attribute;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public class AttributeStreamFunction extends StreamFunctionProcessor {
+    private List<Attribute> newAttributes;
+
     @Override
     protected Object[] process(Object[] data) {
         return new Object[]{"test"};
@@ -43,9 +45,9 @@ protected Object[] process(Object data) {
     }
 
     @Override
-    protected List<Attribute> init(AbstractDefinition inputDefinition,
-                                   ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                                   boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(AbstractDefinition inputDefinition,
+                                ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                boolean outputExpectsExpiredEvents, SiddhiQueryContext siddhiQueryContext) {
         if (attributeExpressionExecutors.length != 1) {
             throw new SiddhiAppCreationException("Only one attribute is expected but found " +
                     attributeExpressionExecutors.length);
@@ -53,11 +55,11 @@ protected List<Attribute> init(AbstractDefinition inputDefinition,
         if (!(attributeExpressionExecutors[0] instanceof ConstantExpressionExecutor)) {
             throw new SiddhiAppCreationException("Attribute is expected to be constant, but its not!");
         }
-        List<Attribute> newAttributes = new ArrayList<>();
+        newAttributes = new ArrayList<>();
         newAttributes.add(
                 new Attribute(((ConstantExpressionExecutor) attributeExpressionExecutors[0]).getValue().toString(),
                         inputDefinition.getAttributeList().get(0).getType()));
-        return newAttributes;
+        return null;
     }
 
     @Override
@@ -71,12 +73,7 @@ public void stop() {
     }
 
     @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
+    public List<Attribute> getReturnAttributes() {
+        return newAttributes;
     }
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/window/TimeLengthWindowTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/window/TimeLengthWindowTestCase.java
index 2d6f01280c..10d2937369 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/window/TimeLengthWindowTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/window/TimeLengthWindowTestCase.java
@@ -273,9 +273,11 @@ public void timeLengthWindowTest6() throws InterruptedException {
         SiddhiManager siddhiManager = new SiddhiManager();
 
         String sensorStream = "define stream sensorStream (id string, sensorValue int);";
-        String query = "@info(name = 'query1') from sensorStream#window.timeLength(3 sec,6)" +
-                " select id,sum(sensorValue) as sum" +
-                " insert all events into outputStream ;";
+        String query = "" +
+                "@info(name = 'query1') " +
+                "from sensorStream#window.timeLength(3 sec, 6) " +
+                "select id, sum(sensorValue) as sum " +
+                "insert all events into outputStream ;";
         SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(sensorStream + query);
         siddhiAppRuntime.addCallback("query1", new QueryCallback() {
             @Override
@@ -303,7 +305,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
                         AssertJUnit.assertEquals("5", removeEvents[0].getData(1).toString());
                     }
                     if (removeEvents[0].getData(0).toString().equals("id3")) {
-                        AssertJUnit.assertEquals("3", removeEvents[0].getData(1).toString());
+                        AssertJUnit.assertEquals("5", removeEvents[0].getData(1).toString());
                     }
                     removeEventCount++;
                 }
@@ -329,10 +331,10 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
         Thread.sleep(520);
         inputHandler.send(new Object[]{"id8", 1});
 
-        Thread.sleep(1000);
+        Thread.sleep(500);
 
         AssertJUnit.assertEquals(8, inEventCount);
-        AssertJUnit.assertEquals(2, removeEventCount);
+        AssertJUnit.assertEquals(3, removeEventCount);
         AssertJUnit.assertTrue(eventArrived);
         siddhiAppRuntime.shutdown();
     }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultFunctionExtension.java b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultFunctionExtension.java
index e1f68a208f..4d9ee0cd6c 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultFunctionExtension.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultFunctionExtension.java
@@ -25,10 +25,10 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
-import java.util.Map;
-
 @Extension(
         name = "fault",
         namespace = "custom",
@@ -50,10 +50,11 @@ public class FaultFunctionExtension extends FunctionExecutor {
     private Attribute.Type returnType;
 
     @Override
-    public void init(ExpressionExecutor[] attributeExpressionExecutors,
-                     ConfigReader configReader,
-                     SiddhiQueryContext siddhiQueryContext) {
+    public StateFactory init(ExpressionExecutor[] attributeExpressionExecutors,
+                             ConfigReader configReader,
+                             SiddhiQueryContext siddhiQueryContext) {
         returnType = Attribute.Type.DOUBLE;
+        return null;
     }
 
     /**
@@ -68,24 +69,14 @@ public Attribute.Type getReturnType() {
 
 
     @Override
-    protected Object execute(Object[] obj) {
+    protected Object execute(Object[] obj, State state) {
         throw new RuntimeException("Error when running faultAdd()");
 
     }
 
     @Override
-    protected Object execute(Object obj) {
+    protected Object execute(Object obj, State state) {
         throw new RuntimeException("Error when running faultAdd()");
     }
 
-    @Override
-    public Map<String, Object> currentState() {
-        //No state
-        return null;
-    }
-
-    @Override
-    public void restoreState(Map<String, Object> state) {
-        //Nothing to be done
-    }
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
index 76e99d2a02..86bfc2f28a 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
@@ -44,7 +44,7 @@
 import io.siddhi.core.stream.input.source.Source;
 import io.siddhi.core.stream.output.sink.Sink;
 import io.siddhi.core.table.Table;
-import io.siddhi.core.util.ElementIdGenerator;
+import io.siddhi.core.util.IdGenerator;
 import io.siddhi.core.util.SiddhiConstants;
 import io.siddhi.core.util.event.handler.EventExchangeHolderFactory;
 import io.siddhi.core.util.lock.LockSynchronizer;
@@ -296,11 +296,11 @@ public void testQueryParser() {
         SiddhiContext siddhicontext = new SiddhiContext();
         SiddhiAppContext context = new SiddhiAppContext();
         context.setSiddhiContext(siddhicontext);
-        context.setElementIdGenerator(new ElementIdGenerator(context.getName()));
+        context.setIdGenerator(new IdGenerator());
         context.setSnapshotService(new SnapshotService(context));
         QueryRuntime runtime = QueryParser.parse(query, context, streamDefinitionMap, tableDefinitionMap,
                 windowDefinitionMap, aggregationDefinitionMap, tableMap, aggregationMap, eventWindowMap,
-                lockSynchronizer, "1");
+                lockSynchronizer, "1", false);
         AssertJUnit.assertNotNull(runtime);
         AssertJUnit.assertTrue(runtime.getStreamRuntime() instanceof SingleStreamRuntime);
         AssertJUnit.assertNotNull(runtime.getSelector());
diff --git a/modules/siddhi-core/src/test/resources/testng.xml b/modules/siddhi-core/src/test/resources/testng.xml
index 8e1d17277a..ba0e005924 100644
--- a/modules/siddhi-core/src/test/resources/testng.xml
+++ b/modules/siddhi-core/src/test/resources/testng.xml
@@ -73,8 +73,8 @@
             <class name="io.siddhi.core.query.pattern.absent.LogicalAbsentPatternTestCase"/>
             <class name="io.siddhi.core.query.pattern.absent.EveryAbsentPatternTestCase"/>
 
-            <class name="io.siddhi.core.query.selector.attribute.aggregator.DistinctCountAttributeAggregatorTestCase"/>
-            <class name="io.siddhi.core.query.selector.attribute.aggregator.StdDevAttributeAggregatorTestCase"/>
+            <class name="io.siddhi.core.query.selector.attribute.aggregator.DistinctCountAttributeAggregatorExecutorTestCase"/>
+            <class name="io.siddhi.core.query.selector.attribute.aggregator.StdDevAttributeAggregatorExecutorTestCase"/>
 
             <class name="io.siddhi.core.query.sequence.SequenceTestCase"/>
             <class name="io.siddhi.core.query.sequence.absent.AbsentSequenceTestCase"/>
diff --git a/modules/siddhi-doc-gen/src/main/java/io/siddhi/doc/gen/metadata/ExtensionType.java b/modules/siddhi-doc-gen/src/main/java/io/siddhi/doc/gen/metadata/ExtensionType.java
index cd7e551203..f8af798e25 100644
--- a/modules/siddhi-doc-gen/src/main/java/io/siddhi/doc/gen/metadata/ExtensionType.java
+++ b/modules/siddhi-doc-gen/src/main/java/io/siddhi/doc/gen/metadata/ExtensionType.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.query.processor.stream.StreamProcessor;
 import io.siddhi.core.query.processor.stream.function.StreamFunctionProcessor;
 import io.siddhi.core.query.processor.stream.window.WindowProcessor;
-import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregator;
+import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregatorExecutor;
 import io.siddhi.core.stream.input.source.Source;
 import io.siddhi.core.stream.input.source.SourceMapper;
 import io.siddhi.core.stream.output.sink.Sink;
@@ -65,7 +65,7 @@ public enum ExtensionType {
         // Populating the processor super class map
         superClassMap = new HashMap<>();
         superClassMap.put(ExtensionType.FUNCTION, FunctionExecutor.class);
-        superClassMap.put(ExtensionType.ATTRIBUTE_AGGREGATOR, AttributeAggregator.class);
+        superClassMap.put(ExtensionType.ATTRIBUTE_AGGREGATOR, AttributeAggregatorExecutor.class);
         superClassMap.put(ExtensionType.WINDOW, WindowProcessor.class);
         superClassMap.put(ExtensionType.STREAM_FUNCTION, StreamFunctionProcessor.class);
         superClassMap.put(ExtensionType.STREAM_PROCESSOR, StreamProcessor.class);
diff --git a/modules/siddhi-query-api/src/main/java/io/siddhi/query/api/execution/query/input/stream/StateInputStream.java b/modules/siddhi-query-api/src/main/java/io/siddhi/query/api/execution/query/input/stream/StateInputStream.java
index c9c2d2e1e5..68e8b056b7 100644
--- a/modules/siddhi-query-api/src/main/java/io/siddhi/query/api/execution/query/input/stream/StateInputStream.java
+++ b/modules/siddhi-query-api/src/main/java/io/siddhi/query/api/execution/query/input/stream/StateInputStream.java
@@ -17,6 +17,7 @@
  */
 package io.siddhi.query.api.execution.query.input.stream;
 
+import io.siddhi.query.api.execution.query.input.handler.StreamHandler;
 import io.siddhi.query.api.execution.query.input.state.CountStateElement;
 import io.siddhi.query.api.execution.query.input.state.EveryStateElement;
 import io.siddhi.query.api.execution.query.input.state.LogicalStateElement;
@@ -34,6 +35,7 @@
 public class StateInputStream extends InputStream {
 
     private static final long serialVersionUID = 1L;
+    private final List<StreamHandler> streamHandlers;
     private Type stateType;
     private StateElement stateElement;
     private List<String> streamIdList;
@@ -42,7 +44,8 @@ public class StateInputStream extends InputStream {
     public StateInputStream(Type stateType, StateElement stateElement, TimeConstant withinTime) {
         this.stateType = stateType;
         this.stateElement = stateElement;
-        this.streamIdList = collectStreamIds(stateElement, new ArrayList<String>());
+        this.streamIdList = collectStreamIds(stateElement, new ArrayList<>());
+        this.streamHandlers = collectStreamHanders(stateElement, new ArrayList<>());
         this.withinTime = withinTime;
     }
 
@@ -59,6 +62,10 @@ public List<String> getAllStreamIds() {
         return streamIdList;
     }
 
+    public List<StreamHandler> getStreamHandlers() {
+        return streamHandlers;
+    }
+
     @Override
     public List<String> getUniqueStreamIds() {
         List<String> uniqueStreams = new ArrayList<String>();
@@ -90,6 +97,26 @@ private List<String> collectStreamIds(StateElement stateElement,
         return streamIds;
     }
 
+    private List<StreamHandler> collectStreamHanders(StateElement stateElement,
+                                                     List<StreamHandler> streamHandlers) {
+        if (stateElement instanceof LogicalStateElement) {
+            collectStreamHanders(((LogicalStateElement) stateElement).getStreamStateElement1(), streamHandlers);
+            collectStreamHanders(((LogicalStateElement) stateElement).getStreamStateElement2(), streamHandlers);
+        } else if (stateElement instanceof CountStateElement) {
+            collectStreamHanders(((CountStateElement) stateElement).getStreamStateElement(), streamHandlers);
+        } else if (stateElement instanceof EveryStateElement) {
+            collectStreamHanders(((EveryStateElement) stateElement).getStateElement(), streamHandlers);
+        } else if (stateElement instanceof NextStateElement) {
+            collectStreamHanders(((NextStateElement) stateElement).getStateElement(), streamHandlers);
+            collectStreamHanders(((NextStateElement) stateElement).getNextStateElement(), streamHandlers);
+        } else if (stateElement instanceof StreamStateElement) {
+            BasicSingleInputStream basicSingleInputStream = ((StreamStateElement) stateElement)
+                    .getBasicSingleInputStream();
+            streamHandlers.addAll(basicSingleInputStream.getStreamHandlers());
+        }
+        return streamHandlers;
+    }
+
     public int getStreamCount(String streamId) {
         int count = 0;
         for (String aStreamId : streamIdList) {
diff --git a/modules/siddhi-samples/quick-start-samples/src/main/java/io/siddhi/sample/util/CustomFunctionExtension.java b/modules/siddhi-samples/quick-start-samples/src/main/java/io/siddhi/sample/util/CustomFunctionExtension.java
index dbe37fd984..616f0fe47b 100644
--- a/modules/siddhi-samples/quick-start-samples/src/main/java/io/siddhi/sample/util/CustomFunctionExtension.java
+++ b/modules/siddhi-samples/quick-start-samples/src/main/java/io/siddhi/sample/util/CustomFunctionExtension.java
@@ -23,10 +23,10 @@
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.function.FunctionExecutor;
 import io.siddhi.core.util.config.ConfigReader;
+import io.siddhi.core.util.snapshot.state.State;
+import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.query.api.definition.Attribute;
 
-import java.util.Map;
-
 public class CustomFunctionExtension extends FunctionExecutor {
 
     private Attribute.Type returnType;
@@ -39,8 +39,8 @@ public class CustomFunctionExtension extends FunctionExecutor {
      * @param siddhiQueryContext           the context of the siddhi query
      */
     @Override
-    protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
-                        SiddhiQueryContext siddhiQueryContext) {
+    protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, ConfigReader configReader,
+                                SiddhiQueryContext siddhiQueryContext) {
         for (ExpressionExecutor expressionExecutor : attributeExpressionExecutors) {
             Attribute.Type attributeType = expressionExecutor.getReturnType();
             if (attributeType == Attribute.Type.DOUBLE) {
@@ -52,17 +52,19 @@ protected void init(ExpressionExecutor[] attributeExpressionExecutors, ConfigRea
                 returnType = Attribute.Type.LONG;
             }
         }
+        return null;
     }
 
     /**
      * The main execution method which will be called upon event arrival
      * when there are more then one function parameter
      *
-     * @param data the runtime values of function parameters
+     * @param data  the runtime values of function parameters
+     * @param state
      * @return the function result
      */
     @Override
-    protected Object execute(Object[] data) {
+    protected Object execute(Object[] data, State state) {
         if (returnType == Attribute.Type.DOUBLE) {
             double total = 0;
             for (Object aObj : data) {
@@ -83,12 +85,13 @@ protected Object execute(Object[] data) {
      * The main execution method which will be called upon event arrival
      * when there are zero or one function parameter
      *
-     * @param data null if the function parameter count is zero or
-     *             runtime data value of the function parameter
+     * @param data  null if the function parameter count is zero or
+     *              runtime data value of the function parameter
+     * @param state Function state
      * @return the function result
      */
     @Override
-    protected Object execute(Object data) {
+    protected Object execute(Object data, State state) {
         if (returnType == Attribute.Type.DOUBLE) {
             return Double.parseDouble(String.valueOf(data));
         } else {
@@ -101,27 +104,4 @@ public Attribute.Type getReturnType() {
         return returnType;
     }
 
-    /**
-     * Used to collect the serializable state of the processing element, that need to be
-     * persisted for the reconstructing the element to the same state on a different point of time
-     *
-     * @return stateful objects of the processing element as an array
-     */
-    @Override
-    public Map<String, Object> currentState() {
-        return null;
-    }
-
-    /**
-     * Used to restore serialized state of the processing element, for reconstructing
-     * the element to the same state as if was on a previous point of time.
-     *
-     * @param state the stateful objects of the element as an array on
-     *              the same order provided by currentState().
-     */
-    @Override
-    public void restoreState(Map<String, Object> state) {
-
-    }
-
 }

From 12638b594529276da6a5ca7f6449cf0e478b883d Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Fri, 22 Mar 2019 01:48:19 +0530
Subject: [PATCH 03/21] Remove redundant state management and synchronizations

Remove redundant state management in SingleStateHolder
and remove redundant synchronizations.
Improve length window and filter query performance to Siddhi 4.x level
---
 findbugs-exclude.xml                          |  4 +
 .../AttributeAggregatorExecutor.java          | 43 ++++-------
 .../snapshot/state/SingleStateHolder.java     | 63 +++++----------
 .../SimpleFilterSingleQueryPerformance.java   |  2 +-
 .../SimpleWindowSingleQueryPerformance.java   | 77 +++++++++++++++++++
 5 files changed, 117 insertions(+), 72 deletions(-)
 create mode 100644 modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleWindowSingleQueryPerformance.java

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 81f8526d45..3b42337aae 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -188,6 +188,10 @@
         <Class name="io.siddhi.core.util.Scheduler$SchedulerState"/>
         <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS"/>
     </Match>
+    <Match>
+        <Class name="io.siddhi.core.util.snapshot.state.SingleStateHolder"/>
+        <Bug pattern="DC_DOUBLECHECK"/>
+    </Match>
 
 
     <Match>
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
index 72d2e7afff..1d23d7a1de 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
@@ -106,48 +106,36 @@ private Object processNoAttribute(ComplexEvent event) {
     }
 
     private Object processAdd(Object data) {
-        S state;
-        state = stateHolder.getState();
+        S state = stateHolder.getState();
         try {
-            synchronized (state) {
-                return processAdd(data, state);
-            }
+            return processAdd(data, state);
         } finally {
             stateHolder.returnState(state);
         }
     }
 
     private Object processRemove(Object data) {
-        S state;
-        state = stateHolder.getState();
+        S state = stateHolder.getState();
         try {
-            synchronized (state) {
-                return processRemove(data, state);
-            }
+            return processRemove(data, state);
         } finally {
             stateHolder.returnState(state);
         }
     }
 
     private Object processAdd(Object[] data) {
-        S state;
-        state = stateHolder.getState();
+        S state = stateHolder.getState();
         try {
-            synchronized (state) {
-                return processAdd(data, state);
-            }
+            return processAdd(data, state);
         } finally {
             stateHolder.returnState(state);
         }
     }
 
     private Object processRemove(Object[] data) {
-        S state;
-        state = stateHolder.getState();
+        S state = stateHolder.getState();
         try {
-            synchronized (state) {
-                return processRemove(data, state);
-            }
+            return processRemove(data, state);
         } finally {
             stateHolder.returnState(state);
         }
@@ -155,15 +143,14 @@ private Object processRemove(Object[] data) {
 
     private Object processReset() {
         Object returnValue = null;
-        synchronized (stateHolder) {
-            Map<String, S> states = stateHolder.getAllStates();
-            try {
-                for (S aState : states.values()) {
-                    returnValue = reset(aState);
-                }
-            } finally {
-                stateHolder.returnStates(states);
+        //todo get all stream per partition
+        Map<String, S> states = stateHolder.getAllStates();
+        try {
+            for (S aState : states.values()) {
+                returnValue = reset(aState);
             }
+        } finally {
+            stateHolder.returnStates(states);
         }
         return returnValue;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
index 1bdeb60e68..245dac7e06 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
@@ -18,12 +18,10 @@
 
 package io.siddhi.core.util.snapshot.state;
 
-import io.siddhi.core.exception.SiddhiAppRuntimeException;
 import org.apache.log4j.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * State holder for non partition use case
@@ -33,65 +31,44 @@ public class SingleStateHolder implements StateHolder {
 
     private final StateFactory stateFactory;
     private State state = null;
+    final Map<String, State> states = new HashMap<>(1);
 
     public SingleStateHolder(StateFactory stateFactory) {
         this.stateFactory = stateFactory;
     }
 
     @Override
-    public synchronized State getState() {
+    public State getState() {
         if (state == null) {
-            state = stateFactory.createNewState();
+            synchronized (this) {
+                if (state == null) {
+                    state = stateFactory.createNewState();
+                    states.put(null, state);
+                }
+            }
         }
-        state.activeUseCount++;
         return state;
     }
 
     @Override
-    public synchronized void returnState(State state) {
-        state.activeUseCount--;
-        if (state.activeUseCount < 0) {
-            throw new SiddhiAppRuntimeException("State active count has reached less then zero, current value is "
-                    + state.activeUseCount);
-        }
-        try {
-            if (state.activeUseCount == 0 && state.canDestroy()) {
-                this.state = null;
-            }
-        } catch (Throwable t) {
-            log.error("Dropping state due to error! " + t.getMessage(), t);
-            this.state = null;
-        }
-
+    public void returnState(State state) {
+//ignore
     }
 
-    public synchronized Map<String, State> getAllStates() {
+    public Map<String, State> getAllStates() {
         if (state == null) {
-            state = stateFactory.createNewState();
+            synchronized (this) {
+                if (state == null) {
+                    state = stateFactory.createNewState();
+                    states.put(null, state);
+                }
+            }
         }
-        Map<String, State> result = new HashMap<>(1);
-        result.put(null, state);
-        state.activeUseCount++;
-        return result;
+        return states;
     }
 
     @Override
-    public synchronized void returnStates(Map states) {
-        for (Map.Entry<String, State> entry : (Set<Map.Entry<String, State>>) states.entrySet()) {
-            entry.getValue().activeUseCount--;
-            if (entry.getValue().activeUseCount < 0) {
-                throw new SiddhiAppRuntimeException("State active count has reached less then zero, current value is "
-                        + entry.getValue().activeUseCount);
-            }
-            try {
-                if (entry.getValue().activeUseCount == 0 && entry.getValue().canDestroy()) {
-                    this.state = null;
-                }
-            } catch (Throwable t) {
-                log.error("Dropping state due to error! " + t.getMessage(), t);
-                this.state = null;
-            }
-
-        }
+    public void returnStates(Map states) {
+        //ignore
     }
 }
diff --git a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterSingleQueryPerformance.java b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterSingleQueryPerformance.java
index 77938c99ea..ddcce91981 100644
--- a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterSingleQueryPerformance.java
+++ b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterSingleQueryPerformance.java
@@ -47,7 +47,7 @@ public void receive(Event[] events) {
                 for (Event event : events) {
                     eventCount++;
                     timeSpent += (System.currentTimeMillis() - (Long) event.getData(3));
-                    if (eventCount % 1000000 == 0) {
+                    if (eventCount % 10000000 == 0) {
                         System.out.println("Throughput : " + (eventCount * 1000) / ((System.currentTimeMillis()) -
                                 startTime));
                         System.out.println("Time spent :  " + (timeSpent * 1.0 / eventCount));
diff --git a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleWindowSingleQueryPerformance.java b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleWindowSingleQueryPerformance.java
new file mode 100644
index 0000000000..852480d7e5
--- /dev/null
+++ b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleWindowSingleQueryPerformance.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package io.siddhi.performance;
+
+import io.siddhi.core.SiddhiAppRuntime;
+import io.siddhi.core.SiddhiManager;
+import io.siddhi.core.event.Event;
+import io.siddhi.core.stream.input.InputHandler;
+import io.siddhi.core.stream.output.StreamCallback;
+
+public class SimpleWindowSingleQueryPerformance {
+
+    public static void main(String[] args) throws InterruptedException {
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "define stream cseEventStream (symbol string, price float, volume int, timestamp long);" +
+                "" +
+                "@info(name = 'query1') " +
+                "from cseEventStream#window.length(10) " +
+                "select symbol, sum(price) as total, avg(volume) as avgVolume, timestamp " +
+                "insert into outputStream ;";
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+        siddhiAppRuntime.addCallback("outputStream", new StreamCallback() {
+            public int eventCount = 0;
+            public int timeSpent = 0;
+            long startTime = System.currentTimeMillis();
+
+            @Override
+            public void receive(Event[] events) {
+                for (Event event : events) {
+                    eventCount++;
+                    timeSpent += (System.currentTimeMillis() - (Long) event.getData(3));
+                    if (eventCount % 10000000 == 0) {
+                        System.out.println("Throughput : " + (eventCount * 1000) / ((System.currentTimeMillis()) -
+                                startTime));
+                        System.out.println("Time spent :  " + (timeSpent * 1.0 / eventCount));
+                        startTime = System.currentTimeMillis();
+                        eventCount = 0;
+                        timeSpent = 0;
+                    }
+                }
+            }
+        });
+
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("cseEventStream");
+        siddhiAppRuntime.start();
+        while (true) {
+            inputHandler.send(new Object[]{"WSO2", 55.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"WSO2", 100f, 80, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"WSO2", 55.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"WSO2", 100f, 80, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+        }
+
+    }
+}

From d744e741a2346e8e947f7e3dcb85d39a5b12bd85 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Sat, 23 Mar 2019 02:00:09 +0530
Subject: [PATCH 04/21] Fix incremental data storage, improve StateHandler to
 handle group by

---
 .../BaseIncrementalValueStore.java            |  38 +-
 .../IncrementalDataAggregator.java            |   4 +-
 ...mentalExternalTimestampDataAggregator.java |   4 +-
 .../siddhi/core/config/SiddhiAppContext.java  |   6 +-
 .../stream/window/CronWindowProcessor.java    |  71 ++--
 .../AttributeAggregatorExecutor.java          |   5 +-
 .../java/io/siddhi/core/util/Scheduler.java   |  48 +--
 .../io/siddhi/core/util/SiddhiConstants.java  |   2 +-
 ...IncrementalFileSystemPersistenceStore.java |   6 +-
 .../util/IncrementalSnapshotInfo.java         |  14 +-
 .../core/util/snapshot/SnapshotService.java   | 374 ++++++++++--------
 .../util/snapshot/state/EmptyStateHolder.java |  16 +-
 .../snapshot/state/PartitionStateHolder.java  | 120 ++++--
 .../snapshot/state/SingleStateHolder.java     |  35 +-
 .../core/util/snapshot/state/StateHolder.java |   8 +-
 .../IncrementalPersistenceTestCase.java       |   1 +
 .../core/managment/PersistenceTestCase.java   |   2 +-
 .../query/partition/PartitionTestCase2.java   |  58 +++
 18 files changed, 495 insertions(+), 317 deletions(-)

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
index 36c0a70f33..fdd2e2bf63 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
@@ -70,14 +70,14 @@ public void clearValues(long startTimeOfNewAggregates, StreamEvent resetEvent) {
         this.initialTimestamp = startTimeOfNewAggregates;
         setTimestamp(startTimeOfNewAggregates);
         setProcessed(false);
-        Map<String, ValueState> states = this.valueStateHolder.getAllStates();
+        Map<String, ValueState> states = this.valueStateHolder.getAllGroupByStates();
         try {
             for (ValueState storeState : states.values()) {
                 storeState.values = null;
                 storeState.lastTimestamp = 0;
             }
         } finally {
-            this.valueStateHolder.returnStates(states);
+            this.valueStateHolder.returnGroupByStates(states);
         }
     }
 
@@ -134,7 +134,7 @@ public Map<String, StreamEvent> getGroupedByEvents() {
         Map<String, StreamEvent> groupedByEvents = new HashMap<>();
 
         if (isProcessed()) {
-            Map<String, ValueState> baseIncrementalValueStoreMap = this.valueStateHolder.getAllStates();
+            Map<String, ValueState> baseIncrementalValueStoreMap = this.valueStateHolder.getAllGroupByStates();
             try {
                 for (Map.Entry<String, ValueState> state : baseIncrementalValueStoreMap.entrySet()) {
                     StreamEvent streamEvent = streamEventPool.borrowEvent();
@@ -145,42 +145,12 @@ public Map<String, StreamEvent> getGroupedByEvents() {
                     groupedByEvents.put(state.getKey(), streamEvent);
                 }
             } finally {
-                this.valueStateHolder.returnStates(baseIncrementalValueStoreMap);
+                this.valueStateHolder.returnGroupByStates(baseIncrementalValueStoreMap);
             }
         }
         return groupedByEvents;
     }
 
-    public ComplexEventChunk<StreamEvent> getProcessedEventChunk() {
-        ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(true);
-        Map<String, ValueState> baseIncrementalValueStoreMap = this.valueStateHolder.getAllStates();
-        try {
-            for (ValueState state : baseIncrementalValueStoreMap.values()) {
-                if (isProcessed()) {
-                    StreamEvent streamEvent = streamEventPool.borrowEvent();
-                    long timestamp = getTimestamp();
-                    streamEvent.setTimestamp(timestamp);
-                    state.setValue(timestamp, 0);
-                    streamEvent.setOutputData(state.values);
-                    streamEventChunk.add(streamEvent);
-                }
-            }
-        } finally {
-            this.valueStateHolder.returnStates(baseIncrementalValueStoreMap);
-        }
-        return streamEventChunk;
-    }
-
-//    public BaseIncrementalValueStore cloneStore(String key, long timestamp) {
-//        List<ExpressionExecutor> newExpressionExecutors = new ArrayList<>(expressionExecutors.size());
-//        expressionExecutors
-//                .forEach(expressionExecutor -> newExpressionExecutors.add(expressionExecutor.cloneExecutor(key)));
-//        ExpressionExecutor newShouldUpdateExpressionExecutor =
-//                (shouldUpdateExpressionExecutor == null) ? null : shouldUpdateExpressionExecutor.cloneExecutor(key);
-//        return new BaseIncrementalValueStore(newExpressionExecutors, streamEventPool, siddhiAppContext,
-//                aggregatorName, newShouldUpdateExpressionExecutor);
-//    }
-
     public void process(StreamEvent streamEvent) {
         ValueState state = valueStateHolder.getState();
         try {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
index 15f89df07a..451c17b269 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
@@ -179,7 +179,7 @@ public ComplexEventChunk<StreamEvent> aggregateInMemoryData(
 
     private ComplexEventChunk<StreamEvent> getProcessedEventChunk() {
         ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(true);
-        Map<String, State> valueStoreMap = this.valueStateHolder.getAllStates();
+        Map<String, State> valueStoreMap = this.valueStateHolder.getAllGroupByStates();
         try {
             for (State aState : valueStoreMap.values()) {
                 ValueState state = (ValueState) aState;
@@ -191,7 +191,7 @@ private ComplexEventChunk<StreamEvent> getProcessedEventChunk() {
                 streamEventChunk.add(streamEvent);
             }
         } finally {
-            this.valueStateHolder.returnStates(valueStoreMap);
+            this.valueStateHolder.returnGroupByStates(valueStoreMap);
         }
         return streamEventChunk;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
index ab38d4142e..2b8b5f9fec 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
@@ -200,7 +200,7 @@ private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
 //        return processedInMemoryEventChunk;
 
         ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(true);
-        Map<String, State> valueStoreMap = this.valueStateHolder.getAllStates();
+        Map<String, State> valueStoreMap = this.valueStateHolder.getAllGroupByStates();
         try {
             for (State aState : valueStoreMap.values()) {
                 ValueState state = (ValueState) aState;
@@ -212,7 +212,7 @@ private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
                 streamEventChunk.add(streamEvent);
             }
         } finally {
-            this.valueStateHolder.returnStates(valueStoreMap);
+            this.valueStateHolder.returnGroupByStates(valueStoreMap);
         }
         return streamEventChunk;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
index ce0d1b1d86..55309cc850 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
@@ -106,7 +106,7 @@ public static String getPartitionFlowId() {
     }
 
     public static String getGroupByFlowId() {
-        return PARTITION_KEY.get();
+        return GROUP_BY_KEY.get();
     }
 
     public SiddhiContext getSiddhiContext() {
@@ -288,10 +288,10 @@ public List<Scheduler> getSchedulerList() {
     public StateHolder generateStateHolder(String name, StateFactory stateFactory) {
         if (stateFactory != null) {
             StateHolder stateHolder = new SingleStateHolder(stateFactory);
-            if (SnapshotService.getSkipStateStorageThreadLocal().get() != null &&
+            if (SnapshotService.getSkipStateStorageThreadLocal().get() == null ||
                     !SnapshotService.getSkipStateStorageThreadLocal().get()) {
                 Map<String, StateHolder> stateHolderMap = getSnapshotService().getStateHolderMap(
-                        SiddhiConstants.PARTITION_ID_DEFAULT, this.getName());
+                        SiddhiConstants.PARTITION_ID_DEFAULT, SiddhiConstants.PARTITION_ID_DEFAULT);
                 stateHolderMap.put(name + "-" + idGenerator.createNewId(), stateHolder);
             }
             return stateHolder;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
index 79fd4b152e..88347e27f7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
@@ -180,47 +180,50 @@ private void scheduleCronJob(String cronString) {
     }
 
     public void dispatchEvents() {
-
-        Map<String, WindowState> states = stateHolder.getAllStates();
+        Map<String, Map<String, WindowState>> allStates = stateHolder.getAllStates();
         try {
-            for (Map.Entry<String, WindowState> state : states.entrySet()) {
-                WindowState windowState = state.getValue();
-                ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<StreamEvent>(false);
-                synchronized (windowState) {
-                    if (windowState.currentEventQueue.getFirst() != null) {
-                        long currentTime = siddhiQueryContext.getSiddhiAppContext().
-                                getTimestampGenerator().currentTime();
-                        while (windowState.expiredEventQueue.hasNext()) {
-                            StreamEvent expiredEvent = windowState.expiredEventQueue.next();
-                            expiredEvent.setTimestamp(currentTime);
-                        }
-                        if (windowState.expiredEventQueue.getFirst() != null) {
-                            streamEventChunk.add(windowState.expiredEventQueue.getFirst());
-                        }
-                        windowState.expiredEventQueue.clear();
-                        while (windowState.currentEventQueue.hasNext()) {
-                            StreamEvent currentEvent = windowState.currentEventQueue.next();
-                            StreamEvent toExpireEvent =
-                                    streamEventClonerHolder.getStreamEventCloner().copyStreamEvent(currentEvent);
-                            toExpireEvent.setType(StreamEvent.Type.EXPIRED);
-                            windowState.expiredEventQueue.add(toExpireEvent);
-                        }
+            for (Map.Entry<String, Map<String, WindowState>> allStatesEntry : allStates.entrySet()) {
+                for (Map.Entry<String, WindowState> stateEntry : allStatesEntry.getValue().entrySet()) {
+                    WindowState windowState = stateEntry.getValue();
+                    ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<StreamEvent>(false);
+                    synchronized (windowState) {
+                        if (windowState.currentEventQueue.getFirst() != null) {
+                            long currentTime = siddhiQueryContext.getSiddhiAppContext().
+                                    getTimestampGenerator().currentTime();
+                            while (windowState.expiredEventQueue.hasNext()) {
+                                StreamEvent expiredEvent = windowState.expiredEventQueue.next();
+                                expiredEvent.setTimestamp(currentTime);
+                            }
+                            if (windowState.expiredEventQueue.getFirst() != null) {
+                                streamEventChunk.add(windowState.expiredEventQueue.getFirst());
+                            }
+                            windowState.expiredEventQueue.clear();
+                            while (windowState.currentEventQueue.hasNext()) {
+                                StreamEvent currentEvent = windowState.currentEventQueue.next();
+                                StreamEvent toExpireEvent =
+                                        streamEventClonerHolder.getStreamEventCloner().copyStreamEvent(currentEvent);
+                                toExpireEvent.setType(StreamEvent.Type.EXPIRED);
+                                windowState.expiredEventQueue.add(toExpireEvent);
+                            }
 
-                        streamEventChunk.add(windowState.currentEventQueue.getFirst());
-                        windowState.currentEventQueue.clear();
+                            streamEventChunk.add(windowState.currentEventQueue.getFirst());
+                            windowState.currentEventQueue.clear();
+                        }
                     }
-                }
-                SiddhiAppContext.startPartitionFlow(state.getKey());
-                try {
-                    if (streamEventChunk.getFirst() != null) {
-                        nextProcessor.process(streamEventChunk);
+                    SiddhiAppContext.startPartitionFlow(allStatesEntry.getKey());
+                    SiddhiAppContext.startGroupByFlow(stateEntry.getKey());
+                    try {
+                        if (streamEventChunk.getFirst() != null) {
+                            nextProcessor.process(streamEventChunk);
+                        }
+                    } finally {
+                        SiddhiAppContext.stopGroupByFlow();
+                        SiddhiAppContext.stopPartitionFlow();
                     }
-                } finally {
-                    SiddhiAppContext.stopPartitionFlow();
                 }
             }
         } finally {
-            stateHolder.returnStates(states);
+            stateHolder.returnAllStates(allStates);
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
index 1d23d7a1de..4651ffd15e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
@@ -143,14 +143,13 @@ private Object processRemove(Object[] data) {
 
     private Object processReset() {
         Object returnValue = null;
-        //todo get all stream per partition
-        Map<String, S> states = stateHolder.getAllStates();
+        Map<String, S> states = stateHolder.getAllGroupByStates();
         try {
             for (S aState : states.values()) {
                 returnValue = reset(aState);
             }
         } finally {
-            stateHolder.returnStates(states);
+            stateHolder.returnGroupByStates(states);
         }
         return returnValue;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
index eee931e40f..a36c9546b1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
@@ -69,13 +69,17 @@ public Scheduler(Schedulable singleThreadEntryValve, SiddhiQueryContext siddhiQu
                 .addTimeChangeListener(new TimestampGeneratorImpl.TimeChangeListener() {
                     @Override
                     public synchronized void onTimeChange(long currentTimestamp) {
-                        Map<String, SchedulerState> states = stateHolder.getAllStates();
+                        Map<String, Map<String, SchedulerState>> allStates = stateHolder.getAllStates();
                         try {
                             TreeMultimap<Long, SchedulerState> sortedExpires = TreeMultimap.create();
-                            for (Map.Entry<String, SchedulerState> stateEntry : states.entrySet()) {
-                                Long lastTime = stateEntry.getValue().toNotifyQueue.peek();
-                                if (lastTime != null && lastTime <= currentTimestamp) {
-                                    sortedExpires.put(lastTime, stateEntry.getValue());
+                            for (Map.Entry<String, Map<String, SchedulerState>> allStatesEntry :
+                                    allStates.entrySet()) {
+                                for (Map.Entry<String, SchedulerState> stateEntry :
+                                        allStatesEntry.getValue().entrySet()) {
+                                    Long lastTime = stateEntry.getValue().toNotifyQueue.peek();
+                                    if (lastTime != null && lastTime <= currentTimestamp) {
+                                        sortedExpires.put(lastTime, stateEntry.getValue());
+                                    }
                                 }
                             }
                             for (Map.Entry<Long, SchedulerState> entry : sortedExpires.entries()) {
@@ -90,7 +94,7 @@ public synchronized void onTimeChange(long currentTimestamp) {
                                 }
                             }
                         } finally {
-                            stateHolder.returnStates(states);
+                            stateHolder.returnAllStates(allStates);
                         }
                     }
                 });
@@ -201,21 +205,25 @@ protected void sendTimerEvents(SchedulerState state) {
      * Schedule events which are not scheduled in the queue when switching back from event time to system current time
      */
     public void switchToLiveMode() {
-        Map<String, SchedulerState> states = stateHolder.getAllStates();
+        Map<String, Map<String, SchedulerState>> allStates = stateHolder.getAllStates();
         try {
-            for (Map.Entry<String, SchedulerState> stateEntry : states.entrySet()) {
-                SiddhiAppContext.startPartitionFlow(stateEntry.getKey());
-                try {
+            for (Map.Entry<String, Map<String, SchedulerState>> allStatesEntry : allStates.entrySet()) {
+                for (Map.Entry<String, SchedulerState> stateEntry : allStatesEntry.getValue().entrySet()) {
                     Long toNotifyTime = stateEntry.getValue().toNotifyQueue.peek();
                     if (toNotifyTime != null) {
-                        schedule(toNotifyTime, stateEntry.getValue());
+                        SiddhiAppContext.startPartitionFlow(allStatesEntry.getKey());
+                        SiddhiAppContext.startGroupByFlow(stateEntry.getKey());
+                        try {
+                            schedule(toNotifyTime, stateEntry.getValue());
+                        } finally {
+                            SiddhiAppContext.stopGroupByFlow();
+                            SiddhiAppContext.stopPartitionFlow();
+                        }
                     }
-                } finally {
-                    SiddhiAppContext.stopPartitionFlow();
                 }
             }
         } finally {
-            stateHolder.returnStates(states);
+            stateHolder.returnAllStates(allStates);
         }
     }
 
@@ -224,24 +232,20 @@ public void switchToLiveMode() {
      * the acquired resources for processing.
      */
     public void switchToPlayBackMode() {
-        Map<String, SchedulerState> states = stateHolder.getAllStates();
+        Map<String, Map<String, SchedulerState>> allStates = stateHolder.getAllStates();
         try {
-            for (Map.Entry<String, SchedulerState> stateEntry : states.entrySet()) {
-                SiddhiAppContext.startPartitionFlow(stateEntry.getKey());
-                try {
+            for (Map.Entry<String, Map<String, SchedulerState>> allStatesEntry : allStates.entrySet()) {
+                for (Map.Entry<String, SchedulerState> stateEntry : allStatesEntry.getValue().entrySet()) {
                     if (stateEntry.getValue().scheduledFuture != null) {
                         stateEntry.getValue().scheduledFuture.cancel(true);
                     }
                     //Make the scheduler running flag to false to make sure scheduler will schedule next time starts
                     stateEntry.getValue().running = false;
-                } finally {
-                    SiddhiAppContext.stopPartitionFlow();
                 }
             }
         } finally {
-            stateHolder.returnStates(states);
+            stateHolder.returnAllStates(allStates);
         }
-
     }
 
     private class EventCaller implements Runnable {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
index 789f28f6c5..a27b024455 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
@@ -122,5 +122,5 @@ public final class SiddhiConstants {
     public static final String NAMESPACE_RETENTION = "retentionPeriod";
     public static final String NAMESPACE_INTERVAL = "interval";
 
-    public static final String PARTITION_ID_DEFAULT = "_none";
+    public static final String PARTITION_ID_DEFAULT = "null";
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/IncrementalFileSystemPersistenceStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/IncrementalFileSystemPersistenceStore.java
index 85e591cda5..929d3c7742 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/IncrementalFileSystemPersistenceStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/IncrementalFileSystemPersistenceStore.java
@@ -117,6 +117,7 @@ public List<IncrementalSnapshotInfo> getListOfRevisionsToLoad(long restoreTime,
     @Override
     public String getLastRevision(String siddhiAppName) {
         long restoreTime = -1;
+        IncrementalSnapshotInfo lastSnapshotInfo = null;
         File dir = new File(folder + File.separator + siddhiAppName);
         File[] files = dir.listFiles();
         if (files == null || files.length == 0) {
@@ -132,6 +133,7 @@ public String getLastRevision(String siddhiAppName) {
                 //Note: Here we discard the (items.length == 2) scenario which is handled
                 // by the full snapshot handling
                 restoreTime = snapshotInfo.getTime();
+                lastSnapshotInfo = snapshotInfo;
             }
         }
         if (restoreTime != -1) {
@@ -139,7 +141,7 @@ public String getLastRevision(String siddhiAppName) {
                 log.debug("Latest revision to load: " + restoreTime + PersistenceConstants.REVISION_SEPARATOR +
                         siddhiAppName);
             }
-            return restoreTime + PersistenceConstants.REVISION_SEPARATOR + siddhiAppName;
+            return lastSnapshotInfo.getRevision();
         }
         return null;
     }
@@ -175,8 +177,6 @@ private void cleanOldRevisions(IncrementalSnapshotInfo incrementalSnapshotInfo)
                     String fileName = file.getName();
                     IncrementalSnapshotInfo snapshotInfo = PersistenceHelper.convertRevision(fileName);
                     if (snapshotInfo.getTime() < baseTimeStamp &&
-                            incrementalSnapshotInfo.getSiddhiAppId().equals(snapshotInfo.getSiddhiAppId()) &&
-                            incrementalSnapshotInfo.getQueryName().equals(snapshotInfo.getQueryName()) &&
                             incrementalSnapshotInfo.getId().equals(snapshotInfo.getId())) {
                         if (incrementalSnapshotInfo.getType() == IncrementalSnapshotInfo.SnapshotType.BASE &&
                                 snapshotInfo.getType() != IncrementalSnapshotInfo.SnapshotType.PERIODIC) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/IncrementalSnapshotInfo.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/IncrementalSnapshotInfo.java
index e4c827921a..f617fafbb7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/IncrementalSnapshotInfo.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/persistence/util/IncrementalSnapshotInfo.java
@@ -26,7 +26,7 @@ public class IncrementalSnapshotInfo {
     private String id;
     private String siddhiAppId;
     private String partitionId;
-    private String partitionKey;
+    private String partitionGroupByKey;
     private String queryName;
     private String elementId;
     private long time;
@@ -34,22 +34,22 @@ public class IncrementalSnapshotInfo {
     private SnapshotType type;
 
     public IncrementalSnapshotInfo(String siddhiAppId, String partitionId, String queryName, String elementId,
-                                   long time, SnapshotType type, String partitionKey) {
+                                   long time, SnapshotType type, String partitionGroupByKey) {
         this.siddhiAppId = siddhiAppId;
         this.partitionId = partitionId;
         this.queryName = queryName;
         this.elementId = elementId;
         this.time = time;
         this.type = type;
-        this.partitionKey = partitionKey;
+        this.partitionGroupByKey = partitionGroupByKey;
         this.id = siddhiAppId +
                 PersistenceConstants.REVISION_SEPARATOR + partitionId +
-                PersistenceConstants.REVISION_SEPARATOR + partitionKey +
+                PersistenceConstants.REVISION_SEPARATOR + partitionGroupByKey +
                 PersistenceConstants.REVISION_SEPARATOR + queryName +
                 PersistenceConstants.REVISION_SEPARATOR + elementId;
         this.revision = time + PersistenceConstants.REVISION_SEPARATOR + siddhiAppId +
                 PersistenceConstants.REVISION_SEPARATOR + partitionId +
-                PersistenceConstants.REVISION_SEPARATOR + partitionKey +
+                PersistenceConstants.REVISION_SEPARATOR + partitionGroupByKey +
                 PersistenceConstants.REVISION_SEPARATOR + queryName +
                 PersistenceConstants.REVISION_SEPARATOR + elementId +
                 PersistenceConstants.REVISION_SEPARATOR + type;
@@ -103,8 +103,8 @@ public String getPartitionId() {
         return partitionId;
     }
 
-    public String getPartitionKey() {
-        return partitionKey;
+    public String getPartitionGroupByKey() {
+        return partitionGroupByKey;
     }
 
     public String getId() {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
index 4b2dcdb40d..3af4700005 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
@@ -116,56 +116,66 @@ public byte[] fullSnapshot() {
                             partitionIdState.getValue().queryStateHolderMap.entrySet()) {
                         for (Map.Entry<String, StateHolder> elementState :
                                 queryState.getValue().elementHolderMap.entrySet()) {
-                            Map<String, State> partitionKeyStates = elementState.getValue().getAllStates();
+                            Map<String, Map<String, State>> partitionKeyStates = elementState.getValue().getAllStates();
                             try {
-                                for (Map.Entry<String, State> partitionKeyState : partitionKeyStates.entrySet()) {
-                                    State state = partitionKeyState.getValue();
-                                    Map<String, Object> itemStates = state.snapshot();
-                                    if (itemStates != null) {
-                                        Map<String, Object> itemSnapshots = new HashMap<>();
-                                        for (Map.Entry<String, Object> itemState : itemStates.entrySet()) {
-                                            if (itemState.getValue() instanceof Snapshot) {
-                                                if (((Snapshot) itemState.getValue()).isIncrementalSnapshot()) {
-                                                    throw new NoPersistenceStoreException("No incremental persistence "
-                                                            + "store exist to store incremental snapshot of siddhiApp:'"
-                                                            + siddhiAppContext.getName()
-                                                            + "' subElement:'" + queryState.getKey()
-                                                            + "' elementId:'" + elementState.getKey()
-                                                            + "' partitionKey:'" + partitionKeyState.getKey()
-                                                            + "' and itemKey:'" + itemState.getKey() + "'");
+                                for (Map.Entry<String, Map<String, State>> partitionKeyState :
+                                        partitionKeyStates.entrySet()) {
+                                    for (Map.Entry<String, State> groupByKeyState :
+                                            partitionKeyState.getValue().entrySet()) {
+                                        String partitionAndGroupByKey = partitionKeyState.getKey() + "--" +
+                                                groupByKeyState.getKey();
+                                        State state = groupByKeyState.getValue();
+                                        Map<String, Object> itemStates = state.snapshot();
+                                        if (itemStates != null) {
+                                            Map<String, Object> itemSnapshots = new HashMap<>();
+                                            for (Map.Entry<String, Object> itemState : itemStates.entrySet()) {
+                                                if (itemState.getValue() instanceof Snapshot) {
+                                                    if (((Snapshot) itemState.getValue()).isIncrementalSnapshot()) {
+                                                        throw new NoPersistenceStoreException("No incremental " +
+                                                                "persistence store exist to store incremental " +
+                                                                "snapshot of siddhiApp:'"
+                                                                + siddhiAppContext.getName()
+                                                                + "' subElement:'" + queryState.getKey()
+                                                                + "' elementId:'" + elementState.getKey()
+                                                                + "' partitionKey:'" + partitionKeyState.getKey()
+                                                                + "' groupByKey:'" + groupByKeyState.getKey()
+                                                                + "' and itemKey:'" + itemState.getKey() + "'");
+                                                    } else {
+                                                        itemSnapshots.put(itemState.getKey(), itemState.getValue());
+                                                    }
                                                 } else {
                                                     itemSnapshots.put(itemState.getKey(), itemState.getValue());
                                                 }
+                                            }
+                                            Map<String, Map<String, Map<String, Map<String, Object>>>>
+                                                    partitionIdSnapshot = fullSnapshot.computeIfAbsent(
+                                                    partitionIdState.getKey(),
+                                                    k -> new HashMap<>());
+                                            Map<String, Map<String, Map<String, Object>>> partitionKeySnapshot =
+                                                    partitionIdSnapshot.computeIfAbsent(
+                                                            partitionAndGroupByKey,
+                                                            k -> new HashMap<>());
+                                            Map<String, Map<String, Object>> querySnapshot =
+                                                    partitionKeySnapshot.computeIfAbsent(
+                                                            queryState.getKey(),
+                                                            k -> new HashMap<>());
+                                            Map<String, Object> elementSnapshot =
+                                                    querySnapshot.get(elementState.getKey());
+                                            if (elementSnapshot == null) {
+                                                querySnapshot.put(elementState.getKey(), itemSnapshots);
                                             } else {
-                                                itemSnapshots.put(itemState.getKey(), itemState.getValue());
+                                                throw new SiddhiAppRuntimeException("Duplicate state exist for " +
+                                                        "siddhiApp:'" + siddhiAppContext.getName()
+                                                        + "' partitionKey:'" + partitionKeyState.getKey()
+                                                        + "' groupByKey:'" + groupByKeyState.getKey()
+                                                        + "' subElement:'" + queryState.getKey()
+                                                        + "' elementId:'" + elementState.getKey() + "'");
                                             }
                                         }
-                                        Map<String, Map<String, Map<String, Map<String, Object>>>> partitionIdSnapshot =
-                                                fullSnapshot.computeIfAbsent(
-                                                        partitionIdState.getKey(),
-                                                        k -> new HashMap<>());
-                                        Map<String, Map<String, Map<String, Object>>> partitionKeySnapshot =
-                                                partitionIdSnapshot.computeIfAbsent(
-                                                        partitionKeyState.getKey(),
-                                                        k -> new HashMap<>());
-                                        Map<String, Map<String, Object>> querySnapshot =
-                                                partitionKeySnapshot.computeIfAbsent(
-                                                        queryState.getKey(),
-                                                        k -> new HashMap<>());
-                                        Map<String, Object> elementSnapshot = querySnapshot.get(elementState.getKey());
-                                        if (elementSnapshot == null) {
-                                            querySnapshot.put(elementState.getKey(), itemSnapshots);
-                                        } else {
-                                            throw new SiddhiAppRuntimeException("Duplicate state exist for siddhiApp:'"
-                                                    + siddhiAppContext.getName()
-                                                    + "' partitionKey:'" + partitionKeyState.getKey()
-                                                    + "' subElement:'" + queryState.getKey()
-                                                    + "' elementId:'" + elementState.getKey() + "'");
-                                        }
                                     }
                                 }
                             } finally {
-                                elementState.getValue().returnStates(partitionKeyStates);
+                                elementState.getValue().returnAllStates(partitionKeyStates);
                             }
                         }
                     }
@@ -205,46 +215,53 @@ public IncrementalSnapshot incrementalSnapshot() {
                             partitionIdState.getValue().queryStateHolderMap.entrySet()) {
                         for (Map.Entry<String, StateHolder> elementState :
                                 queryState.getValue().elementHolderMap.entrySet()) {
-                            Map<String, State> partitionKeyStates = elementState.getValue().getAllStates();
+                            Map<String, Map<String, State>> partitionKeyStates = elementState.getValue().getAllStates();
                             try {
-                                for (Map.Entry<String, State> partitionKeyState : partitionKeyStates.entrySet()) {
-                                    State state = partitionKeyState.getValue();
-                                    Map<String, Object> itemStates = state.snapshot();
-                                    if (itemStates != null) {
-                                        Map<String, Object> itemSnapshotsIncremental = new HashMap<>();
-                                        Map<String, Object> itemSnapshotsIncrementalBase = new HashMap<>();
-                                        Map<String, Object> itemSnapshotsPeriodic = new HashMap<>();
-                                        for (Map.Entry<String, Object> itemState : itemStates.entrySet()) {
-                                            if (itemState.getValue() instanceof Snapshot) {
-                                                if (((Snapshot) itemState).isIncrementalSnapshot()) {
-                                                    itemSnapshotsIncremental.put(itemState.getKey(),
-                                                            itemState.getValue());
+                                for (Map.Entry<String, Map<String, State>> partitionKeyState :
+                                        partitionKeyStates.entrySet()) {
+                                    for (Map.Entry<String, State> groupByKeyState :
+                                            partitionKeyState.getValue().entrySet()) {
+//                                        String partitionAndGroupByKey = partitionKeyState.getKey() + "--" +
+//                                                groupByKeyState.getKey();
+                                        State state = groupByKeyState.getValue();
+                                        Map<String, Object> itemStates = state.snapshot();
+                                        if (itemStates != null) {
+                                            Map<String, Object> itemSnapshotsIncremental = new HashMap<>();
+                                            Map<String, Object> itemSnapshotsIncrementalBase = new HashMap<>();
+                                            Map<String, Object> itemSnapshotsPeriodic = new HashMap<>();
+                                            for (Map.Entry<String, Object> itemState : itemStates.entrySet()) {
+                                                if (itemState.getValue() instanceof Snapshot) {
+                                                    if (((Snapshot) itemState.getValue()).isIncrementalSnapshot()) {
+                                                        itemSnapshotsIncremental.put(itemState.getKey(),
+                                                                itemState.getValue());
+                                                    } else {
+                                                        itemSnapshotsIncrementalBase.put(
+                                                                itemState.getKey(), itemState.getValue());
+                                                    }
                                                 } else {
-                                                    itemSnapshotsIncrementalBase.put(
-                                                            itemState.getKey(), itemState.getValue());
+                                                    itemSnapshotsPeriodic.put(itemState.getKey(), itemState.getValue());
                                                 }
-                                            } else {
-                                                itemSnapshotsPeriodic.put(itemState.getKey(), itemState.getValue());
                                             }
-                                        }
-                                        if (!itemSnapshotsIncremental.isEmpty()) {
-                                            addToSnapshotIncrements(incrementalSnapshotMap, partitionIdState,
-                                                    queryState, elementState, partitionKeyState,
-                                                    itemSnapshotsIncremental);
-                                        }
-                                        if (!itemSnapshotsIncrementalBase.isEmpty()) {
-                                            addToSnapshotIncrements(incrementalBaseSnapshotMap, partitionIdState,
-                                                    queryState, elementState, partitionKeyState,
-                                                    itemSnapshotsIncrementalBase);
-                                        }
-                                        if (!itemSnapshotsPeriodic.isEmpty()) {
-                                            addToSnapshotIncrements(periodicSnapshotMap, partitionIdState, queryState,
-                                                    elementState, partitionKeyState, itemSnapshotsPeriodic);
+                                            if (!itemSnapshotsIncremental.isEmpty()) {
+                                                addToSnapshotIncrements(incrementalSnapshotMap, partitionIdState,
+                                                        queryState, elementState, partitionKeyState, groupByKeyState,
+                                                        itemSnapshotsIncremental);
+                                            }
+                                            if (!itemSnapshotsIncrementalBase.isEmpty()) {
+                                                addToSnapshotIncrements(incrementalBaseSnapshotMap, partitionIdState,
+                                                        queryState, elementState, partitionKeyState, groupByKeyState,
+                                                        itemSnapshotsIncrementalBase);
+                                            }
+                                            if (!itemSnapshotsPeriodic.isEmpty()) {
+                                                addToSnapshotIncrements(periodicSnapshotMap, partitionIdState,
+                                                        queryState, elementState, partitionKeyState, groupByKeyState,
+                                                        itemSnapshotsPeriodic);
+                                            }
                                         }
                                     }
                                 }
                             } finally {
-                                elementState.getValue().returnStates(partitionKeyStates);
+                                elementState.getValue().returnAllStates(partitionKeyStates);
                             }
                         }
                     }
@@ -257,14 +274,14 @@ public IncrementalSnapshot incrementalSnapshot() {
                 log.debug("Snapshot taken for Siddhi app '" + siddhiAppContext.getName() + "'");
             }
             IncrementalSnapshot snapshot = new IncrementalSnapshot();
-            if (!periodicSnapshotMap.isEmpty()) {
-                snapshot.setIncrementalState(periodicSnapshotMap);
+            if (!incrementalSnapshotMap.isEmpty()) {
+                snapshot.setIncrementalState(incrementalSnapshotMap);
             }
             if (!incrementalBaseSnapshotMap.isEmpty()) {
                 snapshot.setIncrementalStateBase(incrementalBaseSnapshotMap);
             }
-            if (!incrementalSnapshotMap.isEmpty()) {
-                snapshot.setPeriodicState(incrementalSnapshotMap);
+            if (!periodicSnapshotMap.isEmpty()) {
+                snapshot.setPeriodicState(periodicSnapshotMap);
             }
             return snapshot;
         } finally {
@@ -276,11 +293,12 @@ private void addToSnapshotIncrements(Map<String, Map<String, byte[]>> incrementa
                                          Map.Entry<String, PartitionIdStateHolder> partitionIdState,
                                          Map.Entry<String, ElementStateHolder> queryState,
                                          Map.Entry<String, StateHolder> elementState,
-                                         Map.Entry<String, State> partitionKeyState,
+                                         Map.Entry<String, Map<String, State>> partitionKeyState,
+                                         Map.Entry<String, State> groupByKeyState,
                                          Map<String, Object> itemSnapshotsIncremental) {
-        String id = partitionKeyState.getKey() + PersistenceConstants.REVISION_SEPARATOR
-                + queryState.getKey() + PersistenceConstants.REVISION_SEPARATOR
-                + elementState.getKey();
+        String id = partitionKeyState.getKey() + "--" + groupByKeyState.getKey() +
+                PersistenceConstants.REVISION_SEPARATOR + queryState.getKey() +
+                PersistenceConstants.REVISION_SEPARATOR + elementState.getKey();
         Map<String, byte[]> partitionIdSnapshot =
                 incrementalSnapshotMap.computeIfAbsent(
                         partitionIdState.getKey(),
@@ -299,16 +317,19 @@ public Map<String, Object> queryState(String queryName) {
                 ElementStateHolder elementStateHolder = partitionIdStateHolder.queryStateHolderMap.get(queryName);
                 if (elementStateHolder != null) {
                     for (Map.Entry<String, StateHolder> elementState : elementStateHolder.elementHolderMap.entrySet()) {
-                        Map<String, State> partitionKeyStates = elementState.getValue().getAllStates();
+                        Map<String, Map<String, State>> partitionKeyStates = elementState.getValue().getAllStates();
                         try {
-                            for (Map.Entry<String, State> partitionKeyState : partitionKeyStates.entrySet()) {
-                                String id = partitionKeyState.getKey() + "_"
-                                        + queryName + "_"
-                                        + elementState.getKey();
-                                queryState.put(id, partitionKeyState.getValue().snapshot());
+                            for (Map.Entry<String, Map<String, State>> partitionKeyState :
+                                    partitionKeyStates.entrySet()) {
+                                for (Map.Entry<String, State> groupByKeyState :
+                                        partitionKeyState.getValue().entrySet()) {
+                                    String id = partitionKeyState.getKey() + "--" + groupByKeyState.getKey() + "_"
+                                            + queryName + "_" + elementState.getKey();
+                                    queryState.put(id, groupByKeyState.getValue().snapshot());
+                                }
                             }
                         } finally {
-                            elementState.getValue().returnStates(partitionKeyStates);
+                            elementState.getValue().returnAllStates(partitionKeyStates);
                         }
                     }
                 }
@@ -417,21 +438,22 @@ public void restore(byte[] snapshot) throws CannotRestoreSiddhiAppStateException
         }
     }
 
-    public void restore(Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>> snapshot)
+    public void restore(Map<String, Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>>
+                                snapshot)
             throws CannotRestoreSiddhiAppStateException {
         try {
             threadBarrier.lock();
             try {
-                for (Map.Entry<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>
+                for (Map.Entry<String, Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>>
                         partitionIdSnapshot : snapshot.entrySet()) {
                     PartitionIdStateHolder partitionStateHolder = partitionIdStates.get(partitionIdSnapshot.getKey());
                     if (partitionStateHolder == null) {
                         continue;
                     }
-                    for (Iterator<Map.Entry<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>> iterator =
-                         partitionIdSnapshot.getValue().entrySet().iterator(); iterator.hasNext(); ) {
-                        Map.Entry<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> partitionKeySnapshot =
-                                iterator.next();
+                    for (Iterator<Map.Entry<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>>
+                         iterator = partitionIdSnapshot.getValue().entrySet().iterator(); iterator.hasNext(); ) {
+                        Map.Entry<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>
+                                partitionKeySnapshot = iterator.next();
                         restoreIncrementalSnapshot(partitionStateHolder, partitionKeySnapshot.getValue());
                         iterator.remove();
                     }
@@ -449,83 +471,108 @@ public void restore(Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInf
     }
 
     private void restoreIncrementalSnapshot(PartitionIdStateHolder partitionIdStateHolder,
-                                            Map<Long, Map<IncrementalSnapshotInfo, byte[]>> incrementalStateByTime) {
+                                            Map<String, Map<Long, Map<IncrementalSnapshotInfo,
+                                                    byte[]>>> incrementalStateByTime) {
         if (incrementalStateByTime != null) {
             String id = null;
             State state = null;
             StateHolder stateHolder = null;
             Map<String, Object> deserializedStateMap = null;
             try {
-                for (Iterator<Map.Entry<Long, Map<IncrementalSnapshotInfo, byte[]>>> iterator =
+                for (Iterator<Map.Entry<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>> iterator =
                      incrementalStateByTime.entrySet().iterator(); iterator.hasNext(); ) {
-                    Map.Entry<Long, Map<IncrementalSnapshotInfo, byte[]>> incrementalStateByTimeEntry = iterator.next();
+                    Map.Entry<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> incrementalStateByTimeEntry =
+                            iterator.next();
                     iterator.remove();
-                    for (Iterator<Map.Entry<IncrementalSnapshotInfo, byte[]>> iterator1 =
-                         incrementalStateByTimeEntry.getValue().entrySet().iterator(); iterator1.hasNext(); ) {
-                        Map.Entry<IncrementalSnapshotInfo, byte[]> incrementalStateByInfoEntry = iterator1.next();
-                        iterator1.remove();
-                        IncrementalSnapshotInfo incrementalSnapshotInfo = incrementalStateByInfoEntry.getKey();
-                        Map<String, Object> singleIncrementSnapshot = (Map<String, Object>)
-                                ByteSerializer.byteToObject(incrementalStateByInfoEntry.getValue(), siddhiAppContext);
-                        if (singleIncrementSnapshot != null) {
-                            if (!incrementalSnapshotInfo.getId().equals(id)) {
-                                if (id != null) {
-                                    state.restore(deserializedStateMap);
-                                    SiddhiAppContext.startPartitionFlow(id);
+                    for (Iterator<Map.Entry<Long, Map<IncrementalSnapshotInfo, byte[]>>> partitionGroupByKeyIterator =
+                         incrementalStateByTimeEntry.getValue().entrySet().iterator();
+                         partitionGroupByKeyIterator.hasNext(); ) {
+                        Map.Entry<Long, Map<IncrementalSnapshotInfo, byte[]>>
+                                partitionGroupByKeyStateByTimeEntry = partitionGroupByKeyIterator.next();
+                        partitionGroupByKeyIterator.remove();
+                        for (Iterator<Map.Entry<IncrementalSnapshotInfo, byte[]>> iterator1 =
+                             partitionGroupByKeyStateByTimeEntry.getValue().entrySet().iterator();
+                             iterator1.hasNext(); ) {
+                            Map.Entry<IncrementalSnapshotInfo, byte[]> incrementalStateByInfoEntry = iterator1.next();
+                            iterator1.remove();
+                            IncrementalSnapshotInfo incrementalSnapshotInfo = incrementalStateByInfoEntry.getKey();
+                            Map<String, Object> singleIncrementSnapshot = (Map<String, Object>)
+                                    ByteSerializer.byteToObject(
+                                            incrementalStateByInfoEntry.getValue(),
+                                            siddhiAppContext);
+                            if (singleIncrementSnapshot != null) {
+                                if (!incrementalSnapshotInfo.getId().equals(id)) {
+                                    if (id != null) {
+                                        state.restore(deserializedStateMap);
+                                        SiddhiAppContext.startPartitionFlow(id);
+                                        try {
+                                            stateHolder.returnState(state);
+                                        } finally {
+                                            SiddhiAppContext.stopPartitionFlow();
+                                        }
+                                        id = null;
+                                        state = null;
+                                        stateHolder = null;
+                                        deserializedStateMap = null;
+                                    }
+                                    ElementStateHolder elementStateHolder = partitionIdStateHolder.
+                                            queryStateHolderMap.get(incrementalSnapshotInfo.getQueryName());
+                                    if (elementStateHolder == null) {
+                                        continue;
+                                    }
+                                    stateHolder = elementStateHolder.elementHolderMap.get(
+                                            incrementalSnapshotInfo.getElementId());
+                                    if (stateHolder == null) {
+                                        continue;
+                                    }
+                                    String partitionKey = null;
+                                    String groupByKey = null;
+                                    String[] keys = incrementalSnapshotInfo.getPartitionGroupByKey().split("--");
+                                    if (keys.length == 2) {
+                                        if (!keys[0].equals("null")) {
+                                            partitionKey = keys[0];
+                                        }
+                                        if (!keys[1].equals("null")) {
+                                            groupByKey = keys[1];
+                                        }
+                                    }
+                                    SiddhiAppContext.startPartitionFlow(partitionKey);
+                                    SiddhiAppContext.startGroupByFlow(groupByKey);
                                     try {
-                                        stateHolder.returnState(state);
+                                        state = stateHolder.getState();
                                     } finally {
+                                        SiddhiAppContext.stopGroupByFlow();
                                         SiddhiAppContext.stopPartitionFlow();
                                     }
-                                    id = null;
-                                    state = null;
-                                    stateHolder = null;
-                                    deserializedStateMap = null;
-                                }
-                                ElementStateHolder elementStateHolder = partitionIdStateHolder.queryStateHolderMap.get(
-                                        incrementalSnapshotInfo.getQueryName());
-                                if (elementStateHolder == null) {
-                                    continue;
-                                }
-                                stateHolder = elementStateHolder.elementHolderMap.get(
-                                        incrementalSnapshotInfo.getElementId());
-                                if (stateHolder == null) {
-                                    continue;
-                                }
-                                SiddhiAppContext.startPartitionFlow(incrementalSnapshotInfo.getPartitionKey());
-                                try {
-                                    state = stateHolder.getState();
-                                } finally {
-                                    SiddhiAppContext.stopPartitionFlow();
+                                    if (state != null) {
+                                        id = incrementalSnapshotInfo.getId();
+                                        deserializedStateMap = new HashMap<>();
+                                    }
                                 }
                                 if (state != null) {
-                                    id = incrementalSnapshotInfo.getId();
-                                    deserializedStateMap = new HashMap<>();
-                                }
-                            }
-                            if (state != null) {
-                                for (Map.Entry<String, Object> singleIncrementSnapshotEntry :
-                                        singleIncrementSnapshot.entrySet()) {
-                                    if (singleIncrementSnapshotEntry.getValue() instanceof Snapshot) {
-                                        Snapshot snapshot = (Snapshot)
-                                                singleIncrementSnapshotEntry.getValue();
-                                        SnapshotStateList snapshotStateList = (SnapshotStateList)
-                                                deserializedStateMap.computeIfAbsent(
-                                                        singleIncrementSnapshotEntry.getKey(),
-                                                        k -> new SnapshotStateList());
-                                        if (snapshot.isIncrementalSnapshot()) {
-                                            snapshotStateList.putSnapshotState(
-                                                    incrementalStateByTimeEntry.getKey(),
-                                                    snapshot);
+                                    for (Map.Entry<String, Object> singleIncrementSnapshotEntry :
+                                            singleIncrementSnapshot.entrySet()) {
+                                        if (singleIncrementSnapshotEntry.getValue() instanceof Snapshot) {
+                                            Snapshot snapshot = (Snapshot)
+                                                    singleIncrementSnapshotEntry.getValue();
+                                            SnapshotStateList snapshotStateList = (SnapshotStateList)
+                                                    deserializedStateMap.computeIfAbsent(
+                                                            singleIncrementSnapshotEntry.getKey(),
+                                                            k -> new SnapshotStateList());
+                                            if (snapshot.isIncrementalSnapshot()) {
+                                                snapshotStateList.putSnapshotState(
+                                                        partitionGroupByKeyStateByTimeEntry.getKey(),
+                                                        snapshot);
+                                            } else {
+                                                snapshotStateList.getSnapshotStates().clear();
+                                                snapshotStateList.putSnapshotState(
+                                                        partitionGroupByKeyStateByTimeEntry.getKey(),
+                                                        snapshot);
+                                            }
                                         } else {
-                                            snapshotStateList.getSnapshotStates().clear();
-                                            snapshotStateList.putSnapshotState(
-                                                    incrementalStateByTimeEntry.getKey(),
-                                                    snapshot);
+                                            deserializedStateMap.put(singleIncrementSnapshotEntry.getKey(),
+                                                    singleIncrementSnapshotEntry.getValue());
                                         }
-                                    } else {
-                                        deserializedStateMap.put(singleIncrementSnapshotEntry.getKey(),
-                                                singleIncrementSnapshotEntry.getValue());
                                     }
                                 }
                             }
@@ -558,6 +605,7 @@ private void restoreIncrementalSnapshot(PartitionIdStateHolder partitionIdStateH
                     stateHolder = null;
                 }
             }
+
         }
     }
 
@@ -628,15 +676,19 @@ public int compare(IncrementalSnapshotInfo o1, IncrementalSnapshotInfo o2) {
                     }
                     lastId = snapshotInfo.getId();
                 }
-                Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>> incrementalState =
-                        new HashMap<>();
+                Map<String, Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>>
+                        incrementalState = new HashMap<>();
                 for (IncrementalSnapshotInfo snapshotInfo : incrementalSnapshotInfos) {
-                    Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> incrementalStateByPartitionKey =
-                            incrementalState.computeIfAbsent(snapshotInfo.getPartitionId(), k -> new TreeMap<>());
-                    Map<Long, Map<IncrementalSnapshotInfo, byte[]>> incrementalStateByTime =
-                            incrementalStateByPartitionKey.computeIfAbsent(snapshotInfo.getPartitionKey(),
+                    Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>
+                            incrementalStateByPartitionKey = incrementalState.computeIfAbsent(
+                            snapshotInfo.getPartitionId(), k -> new TreeMap<>());
+                    Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> incrementalStateByTime =
+                            incrementalStateByPartitionKey.computeIfAbsent(snapshotInfo.getPartitionGroupByKey(),
+                                    k -> new TreeMap<>());
+                    Map<Long, Map<IncrementalSnapshotInfo, byte[]>> idByTime =
+                            incrementalStateByTime.computeIfAbsent(snapshotInfo.getId(),
                                     k -> new TreeMap<>());
-                    Map<IncrementalSnapshotInfo, byte[]> incrementalStateByInfo = incrementalStateByTime.
+                    Map<IncrementalSnapshotInfo, byte[]> incrementalStateByInfo = idByTime.
                             computeIfAbsent(snapshotInfo.getTime(), k -> new HashMap<>());
                     incrementalStateByInfo.put(snapshotInfo, incrementalPersistenceStore.load(snapshotInfo));
                 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
index fe695b9617..6ad40f5577 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
@@ -26,6 +26,8 @@
  */
 public class EmptyStateHolder implements StateHolder {
 
+    private Map emptyMap = new HashMap(0);
+
     @Override
     public State getState() {
         return null;
@@ -37,11 +39,21 @@ public void returnState(State state) {
 
     @Override
     public Map<String, State> getAllStates() {
-        return new HashMap<>(0);
+        return emptyMap;
+    }
+
+    @Override
+    public void returnAllStates(Map partitionKeyStates) {
+
+    }
+
+    @Override
+    public Map getAllGroupByStates() {
+        return emptyMap;
     }
 
     @Override
-    public void returnStates(Map partitionKeyStates) {
+    public void returnGroupByStates(Map states) {
 
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
index a6e52d9ae9..659c45920a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
@@ -33,7 +33,7 @@ public class PartitionStateHolder implements StateHolder {
     private static final Logger log = Logger.getLogger(PartitionStateHolder.class);
 
     private StateFactory stateFactory;
-    private Map<String, State> states = new HashMap<>();
+    private Map<String, Map<String, State>> states = new HashMap<>();
 
     public PartitionStateHolder(StateFactory stateFactory) {
         this.stateFactory = stateFactory;
@@ -41,60 +41,114 @@ public PartitionStateHolder(StateFactory stateFactory) {
 
     @Override
     public synchronized State getState() {
-        String key = SiddhiAppContext.getCurrentFlowId();
-        State state = states.get(key);
-        if (state == null) {
-            state = stateFactory.createNewState();
-            states.put(key, state);
-        }
+        String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
+        String groupByFlowId = SiddhiAppContext.getGroupByFlowId();
+        Map<String, State> partitionStates = states.computeIfAbsent(partitionFlowId, k -> new HashMap<>());
+        State state = partitionStates.computeIfAbsent(groupByFlowId, s -> stateFactory.createNewState());
         state.activeUseCount++;
         return state;
     }
 
     @Override
     public synchronized void returnState(State state) {
-        String key = SiddhiAppContext.getCurrentFlowId();
+        String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
+        String groupByFlowId = SiddhiAppContext.getGroupByFlowId();
         state.activeUseCount--;
-        if (state.activeUseCount < 0) {
+        if (state.activeUseCount == 0) {
+            try {
+                if (state.canDestroy()) {
+                    removeState(partitionFlowId, groupByFlowId);
+                }
+            } catch (Throwable t) {
+                log.error("Dropping partition state for partition key '" + partitionFlowId +
+                        "' and the group by key '" + groupByFlowId + "', due to error! " + t.getMessage(), t);
+                removeState(partitionFlowId, groupByFlowId);
+            }
+        } else if (state.activeUseCount < 0) {
             throw new SiddhiAppRuntimeException("State active count has reached less then zero for partition key '" +
-                    key + "', current value is " + state.activeUseCount);
+                    partitionFlowId + "' and the group by key '" + groupByFlowId + "', current value is " +
+                    state.activeUseCount);
         }
-        try {
+    }
 
-            if (state.activeUseCount == 0 && state.canDestroy()) {
-                states.remove(key);
+    private void removeState(String partitionFlowId, String groupByFlowId) {
+        Map<String, State> groupByStates = states.get(partitionFlowId);
+        if (groupByStates != null) {
+            groupByStates.remove(groupByFlowId);
+            if (groupByStates.isEmpty()) {
+                states.remove(partitionFlowId);
             }
-        } catch (Throwable t) {
-            log.error("Dropping partition state '" + key + "' due to error! " + t.getMessage(), t);
-            states.remove(key);
         }
     }
 
-    public synchronized Map<String, State> getAllStates() {
-        for (Map.Entry<String, State> entry : states.entrySet()) {
-            entry.getValue().activeUseCount++;
+    public synchronized Map<String, Map<String, State>> getAllStates() {
+        for (Map<String, State> groupByStates : states.values()) {
+            for (State state : groupByStates.values()) {
+                state.activeUseCount++;
+            }
         }
-        return new HashMap<>(states);
+        return states;
     }
 
     @Override
-    public synchronized void returnStates(Map states) {
-        for (Map.Entry<String, State> entry : (Set<Map.Entry<String, State>>) states.entrySet()) {
-            entry.getValue().activeUseCount--;
-            if (entry.getValue().activeUseCount < 0) {
+    public Map<String, State> getAllGroupByStates() {
+        String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
+        Map<String, State> groupByStates = states.computeIfAbsent(partitionFlowId, k -> new HashMap<>());
+        for (State state : groupByStates.values()) {
+            state.activeUseCount++;
+        }
+        return groupByStates;
+    }
+
+    @Override
+    public synchronized void returnGroupByStates(Map states) {
+        String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
+        for (Map.Entry<String, State> stateEntry : (Set<Map.Entry<String, State>>) states.entrySet()) {
+            State state = stateEntry.getValue();
+            state.activeUseCount--;
+            if (state.activeUseCount == 0) {
+                try {
+                    if (state.canDestroy()) {
+                        removeState(partitionFlowId, stateEntry.getKey());
+                    }
+                } catch (Throwable t) {
+                    log.error("Dropping partition state for partition key '" + partitionFlowId +
+                            "' and the group by key '" + stateEntry.getKey() + "', due to error! " + t.getMessage(), t);
+                    removeState(partitionFlowId, stateEntry.getKey());
+                }
+            } else if (state.activeUseCount < 0) {
                 throw new SiddhiAppRuntimeException("State active count has reached less then zero for partition key '"
-                        + entry.getKey() + "', current value is " + entry.getValue().activeUseCount);
+                        + partitionFlowId + "' and the group by key '" + stateEntry.getKey() + "', current value is " +
+                        state.activeUseCount);
             }
-            String key = entry.getKey();
-            try {
-                if (entry.getValue().activeUseCount == 0 && entry.getValue().canDestroy()) {
-                    this.states.remove(key);
+        }
+    }
+
+    @Override
+    public synchronized void returnAllStates(Map states) {
+        for (Map.Entry<String, Map<String, State>> statesEntry :
+                (Set<Map.Entry<String, Map<String, State>>>) states.entrySet()) {
+            for (Map.Entry<String, State> stateEntry : statesEntry.getValue().entrySet()) {
+                State state = stateEntry.getValue();
+                state.activeUseCount--;
+                if (state.activeUseCount == 0) {
+                    try {
+                        if (state.canDestroy()) {
+                            removeState(statesEntry.getKey(), stateEntry.getKey());
+                        }
+                    } catch (Throwable t) {
+                        log.error("Dropping partition state for partition key '" + statesEntry.getKey() +
+                                "' and the group by key '" + stateEntry.getKey() + "', due to error! " +
+                                t.getMessage(), t);
+                        removeState(statesEntry.getKey(), stateEntry.getKey());
+                    }
+                } else if (state.activeUseCount < 0) {
+                    throw new SiddhiAppRuntimeException("State active count has reached less then zero for " +
+                            "partition key '" + statesEntry.getKey() + "' and the group by key '" +
+                            stateEntry.getKey() + "', current value is " +
+                            state.activeUseCount);
                 }
-            } catch (Throwable t) {
-                log.error("Dropping partition state '" + key + "' due to error! " + t.getMessage(), t);
-                this.states.remove(key);
             }
-
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
index 245dac7e06..8183fcaeef 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
@@ -31,10 +31,12 @@ public class SingleStateHolder implements StateHolder {
 
     private final StateFactory stateFactory;
     private State state = null;
-    final Map<String, State> states = new HashMap<>(1);
+    final Map<String, State> groupByStates = new HashMap<>(1);
+    final Map<String, Map<String, State>> allStates = new HashMap<>(1);
 
     public SingleStateHolder(StateFactory stateFactory) {
         this.stateFactory = stateFactory;
+        this.allStates.put(null, groupByStates);
     }
 
     @Override
@@ -43,7 +45,7 @@ public State getState() {
             synchronized (this) {
                 if (state == null) {
                     state = stateFactory.createNewState();
-                    states.put(null, state);
+                    groupByStates.put(null, state);
                 }
             }
         }
@@ -52,23 +54,42 @@ public State getState() {
 
     @Override
     public void returnState(State state) {
-//ignore
+        //ignore
+    }
+
+    public Map<String, Map<String, State>> getAllStates() {
+        if (state == null) {
+            synchronized (this) {
+                if (state == null) {
+                    state = stateFactory.createNewState();
+                    groupByStates.put(null, state);
+                }
+            }
+        }
+        return allStates;
+    }
+
+    @Override
+    public void returnAllStates(Map states) {
+        //ignore
+
     }
 
-    public Map<String, State> getAllStates() {
+    @Override
+    public Map<String, State> getAllGroupByStates() {
         if (state == null) {
             synchronized (this) {
                 if (state == null) {
                     state = stateFactory.createNewState();
-                    states.put(null, state);
+                    groupByStates.put(null, state);
                 }
             }
         }
-        return states;
+        return groupByStates;
     }
 
     @Override
-    public void returnStates(Map states) {
+    public void returnGroupByStates(Map states) {
         //ignore
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
index 69a33820ac..b77528384f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
@@ -31,7 +31,11 @@ public interface StateHolder<S extends State> {
 
     void returnState(S state);
 
-    Map<String, S> getAllStates();
+    Map<String, Map<String, S>> getAllStates();
 
-    void returnStates(Map<String, S> partitionKeyStates);
+    void returnAllStates(Map<String, Map<String, S>> states);
+
+    Map<String, S> getAllGroupByStates();
+
+    void returnGroupByStates(Map<String, S> states);
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/IncrementalPersistenceTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/IncrementalPersistenceTestCase.java
index 8fdb524fba..f61479b821 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/IncrementalPersistenceTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/IncrementalPersistenceTestCase.java
@@ -130,6 +130,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
         try {
             siddhiAppRuntime.restoreLastRevision();
         } catch (CannotRestoreSiddhiAppStateException e) {
+            log.error(e.getMessage(), e);
             Assert.fail("Restoring of Siddhi app " + siddhiAppRuntime.getName() + " failed");
         }
         siddhiAppRuntime.start();
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/PersistenceTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/PersistenceTestCase.java
index 3761bb1ecb..90be52be9f 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/PersistenceTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/PersistenceTestCase.java
@@ -572,7 +572,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
                         AssertJUnit.assertEquals(300L, inEvent.getData(2));
                     }
                     if (count == 6) {
-                        AssertJUnit.assertEquals(100L, inEvent.getData(2));
+                        AssertJUnit.assertEquals(300L, inEvent.getData(2));
                     }
                 }
             }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionTestCase2.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionTestCase2.java
index 93f819eab4..f5a433642d 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionTestCase2.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionTestCase2.java
@@ -26,6 +26,7 @@
 import io.siddhi.core.util.EventPrinter;
 import io.siddhi.core.util.SiddhiTestHelper;
 import org.apache.log4j.Logger;
+import org.testng.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -673,4 +674,61 @@ public void partitionStreamValidationTest() throws InterruptedException {
 
         }
     }
+
+    @Test
+    public void testPartitionQuery() throws InterruptedException {
+        log.info("Partition test1");
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "@app:name('PartitionTest') " +
+                "define stream streamA (ts long, symbol string, price int);" +
+                "partition with (symbol of streamA) " +
+                "begin " +
+                "   @info(name = 'query1') " +
+                "   from streamA#window.lengthBatch(2, true) " +
+                "   select symbol, sum(price) as total " +
+                "   insert all events into StockQuote ;  " +
+                "end ";
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+
+        StreamCallback streamCallback = new StreamCallback() {
+            @Override
+            public void receive(Event[] events) {
+                EventPrinter.print(events);
+                AssertJUnit.assertTrue("IBM".equals(events[0].getData(0)) || "WSO2".equals(events[0].getData(0)));
+                int eventCount = count.addAndGet(events.length);
+                eventArrived = true;
+                if (eventCount == 1) {
+                    Assert.assertEquals(events[0].getData(1), 700L);
+                } else if (eventCount == 2) {
+                    Assert.assertEquals(events[0].getData(1), 60L);
+                } else if (eventCount == 3) {
+                    Assert.assertEquals(events[0].getData(1), 120L);
+                } else if (eventCount == 4) {
+                    Assert.assertEquals(events[0].getData(1), 60L);
+                } else if (eventCount == 5) {
+                    Assert.assertEquals(events[0].getData(1), 1400L);
+                } else if (eventCount == 6) {
+                    Assert.assertEquals(events[0].getData(1), 700L);
+                }
+            }
+        };
+        siddhiAppRuntime.addCallback("StockQuote", streamCallback);
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("streamA");
+        siddhiAppRuntime.start();
+        inputHandler.send(new Object[]{100L, "IBM", 700});
+        inputHandler.send(new Object[]{101L, "WSO2", 60});
+        inputHandler.send(new Object[]{101L, "WSO2", 60});
+        inputHandler.send(new Object[]{1134L, "WSO2", 60});
+        inputHandler.send(new Object[]{100L, "IBM", 700});
+        inputHandler.send(new Object[]{1145L, "IBM", 700});
+        SiddhiTestHelper.waitForEvents(100, 6, count, 60000);
+        AssertJUnit.assertTrue(eventArrived);
+        AssertJUnit.assertEquals(6, count.get());
+
+        siddhiAppRuntime.shutdown();
+    }
+
 }

From a92c4997ea3085e9904b109e58486fc393b9d295 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Sat, 23 Mar 2019 02:20:31 +0530
Subject: [PATCH 05/21] Fix concurrency and build issues.

---
 .../BaseIncrementalValueStore.java            |  1 -
 .../snapshot/state/PartitionStateHolder.java  | 30 ++++++++++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
index fdd2e2bf63..c85b17cdcc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
@@ -20,7 +20,6 @@
 
 import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.executor.ExpressionExecutor;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
index 659c45920a..618db9b3bb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
@@ -23,6 +23,7 @@
 import org.apache.log4j.Logger;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -103,44 +104,54 @@ public Map<String, State> getAllGroupByStates() {
     @Override
     public synchronized void returnGroupByStates(Map states) {
         String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
-        for (Map.Entry<String, State> stateEntry : (Set<Map.Entry<String, State>>) states.entrySet()) {
+        for (Iterator<Map.Entry<String, State>> iterator =
+             ((Set<Map.Entry<String, State>>) states.entrySet()).iterator();
+             iterator.hasNext(); ) {
+            Map.Entry<String, State> stateEntry = iterator.next();
             State state = stateEntry.getValue();
             state.activeUseCount--;
             if (state.activeUseCount == 0) {
                 try {
                     if (state.canDestroy()) {
-                        removeState(partitionFlowId, stateEntry.getKey());
+                        iterator.remove();
                     }
                 } catch (Throwable t) {
                     log.error("Dropping partition state for partition key '" + partitionFlowId +
                             "' and the group by key '" + stateEntry.getKey() + "', due to error! " + t.getMessage(), t);
-                    removeState(partitionFlowId, stateEntry.getKey());
+                    iterator.remove();
                 }
             } else if (state.activeUseCount < 0) {
                 throw new SiddhiAppRuntimeException("State active count has reached less then zero for partition key '"
                         + partitionFlowId + "' and the group by key '" + stateEntry.getKey() + "', current value is " +
                         state.activeUseCount);
             }
+
+        }
+        if (states.isEmpty()) {
+            states.remove(partitionFlowId);
         }
     }
 
     @Override
     public synchronized void returnAllStates(Map states) {
-        for (Map.Entry<String, Map<String, State>> statesEntry :
-                (Set<Map.Entry<String, Map<String, State>>>) states.entrySet()) {
-            for (Map.Entry<String, State> stateEntry : statesEntry.getValue().entrySet()) {
+        for (Iterator<Map.Entry<String, Map<String, State>>> statesIterator =
+             ((Set<Map.Entry<String, Map<String, State>>>) states.entrySet()).iterator(); statesIterator.hasNext(); ) {
+            Map.Entry<String, Map<String, State>> statesEntry = statesIterator.next();
+            for (Iterator<Map.Entry<String, State>> stateIterator = statesEntry.getValue().entrySet().iterator();
+                 stateIterator.hasNext(); ) {
+                Map.Entry<String, State> stateEntry = stateIterator.next();
                 State state = stateEntry.getValue();
                 state.activeUseCount--;
                 if (state.activeUseCount == 0) {
                     try {
                         if (state.canDestroy()) {
-                            removeState(statesEntry.getKey(), stateEntry.getKey());
+                            stateIterator.remove();
                         }
                     } catch (Throwable t) {
                         log.error("Dropping partition state for partition key '" + statesEntry.getKey() +
                                 "' and the group by key '" + stateEntry.getKey() + "', due to error! " +
                                 t.getMessage(), t);
-                        removeState(statesEntry.getKey(), stateEntry.getKey());
+                        stateIterator.remove();
                     }
                 } else if (state.activeUseCount < 0) {
                     throw new SiddhiAppRuntimeException("State active count has reached less then zero for " +
@@ -149,6 +160,9 @@ public synchronized void returnAllStates(Map states) {
                             state.activeUseCount);
                 }
             }
+            if (statesEntry.getValue().isEmpty()) {
+                statesIterator.remove();
+            }
         }
     }
 

From a7fa11ac6eb0b41e75ce55a1fbeedc7017742c52 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Sat, 23 Mar 2019 20:00:26 +0530
Subject: [PATCH 06/21] Fix build issues

---
 .../output/ratelimit/OutputRateLimiter.java     |  9 +++------
 .../snapshot/state/PartitionStateHolder.java    |  2 +-
 .../core/aggregation/Aggregation1TestCase.java  | 17 ++++++++++++++---
 .../core/managment/PersistenceTestCase.java     |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
index 25db12e1e1..37acaf452a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
@@ -62,18 +62,15 @@ public void init(LockWrapper lockWrapper, boolean groupBy, SiddhiQueryContext si
     public void sendToCallBacks(ComplexEventChunk complexEventChunk) {
         MultiProcessStreamReceiver.ReturnEventHolder returnEventHolder =
                 MultiProcessStreamReceiver.getMultiProcessReturn().get();
+        if (siddhiQueryContext.getSiddhiAppContext().isStatsEnabled() && latencyTracker != null) {
+            latencyTracker.markOut();
+        }
         if (returnEventHolder != null) {
             returnEventHolder.setReturnEvents(complexEventChunk);
             return;
         } else if (lockWrapper != null) {
             lockWrapper.unlock();
         }
-        if (siddhiQueryContext.getSiddhiAppContext().isStatsEnabled() && latencyTracker != null) {
-            latencyTracker.markOut();
-        }
-        if (lockWrapper != null) {
-            lockWrapper.unlock();
-        }
         if (!queryCallbacks.isEmpty()) {
             for (QueryCallback callback : queryCallbacks) {
                 callback.receiveStreamEvent(complexEventChunk);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
index 618db9b3bb..50c41fdb14 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
@@ -92,7 +92,7 @@ public synchronized Map<String, Map<String, State>> getAllStates() {
     }
 
     @Override
-    public Map<String, State> getAllGroupByStates() {
+    public synchronized Map<String, State> getAllGroupByStates() {
         String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
         Map<String, State> groupByStates = states.computeIfAbsent(partitionFlowId, k -> new HashMap<>());
         for (State state : groupByStates.values()) {
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/aggregation/Aggregation1TestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/aggregation/Aggregation1TestCase.java
index f2765be10e..223dbd40d1 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/aggregation/Aggregation1TestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/aggregation/Aggregation1TestCase.java
@@ -274,8 +274,8 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
                     new Object[]{1496289950000L, "WSO2", 60.0, 240.0, 700f},
                     new Object[]{1496289951000L, "IBM", 100.0, 200.0, 9600f},
                     new Object[]{1496289952000L, "IBM", 700.0, 1400.0, 3500f},
-                    new Object[]{1496289953000L, "IBM", 400.0, 400.0, 3600f},
                     new Object[]{1496289953000L, "WSO2", 100.0, 300.0, 1540f},
+                    new Object[]{1496289953000L, "IBM", 400.0, 400.0, 3600f},
                     new Object[]{1496289954000L, "IBM", 600.0, 600.0, 3600f},
                     new Object[]{1496290016000L, "IBM", 1000.0, 1000.0, 9000f}
             );
@@ -939,7 +939,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
                     "2017-06-01 09:35:52 +05:30", "seconds"});
             Thread.sleep(100);
 
-            List<Object[]> expected = Arrays.asList(
+            List<Object[]> expected1 = Arrays.asList(
                     new Object[]{1496289950000L, 240.0, 60.0, 700f, "WSO2", 70f, 50f},
                     new Object[]{1496289951000L, 200.0, 100.0, 9600f, "IBM", 100f, 100f},
                     new Object[]{1496289952000L, 1400.0, 700.0, 3500f, "IBM", 900f, 500f},
@@ -948,10 +948,21 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
                     new Object[]{1496289954000L, 600.0, 600.0, 3600f, "IBM", 600f, 600f},
                     new Object[]{1496290016000L, 1000.0, 1000.0, 9000f, "IBM", 1000f, 1000f}
             );
+            List<Object[]> expected2 = Arrays.asList(
+                    new Object[]{1496289950000L, 240.0, 60.0, 700f, "WSO2", 70f, 50f},
+                    new Object[]{1496289951000L, 200.0, 100.0, 9600f, "IBM", 100f, 100f},
+                    new Object[]{1496289952000L, 1400.0, 700.0, 3500f, "IBM", 900f, 500f},
+                    new Object[]{1496289953000L, 300.0, 100.0, 1540f, "WSO2", 140f, 60f},
+                    new Object[]{1496289953000L, 400.0, 400.0, 3600f, "IBM", 400f, 400f},
+                    new Object[]{1496289954000L, 600.0, 600.0, 3600f, "IBM", 600f, 600f},
+                    new Object[]{1496290016000L, 1000.0, 1000.0, 9000f, "IBM", 1000f, 1000f}
+            );
             SiddhiTestHelper.waitForEvents(100, 7, inEventCount, 60000);
             AssertJUnit.assertEquals("Event arrived", true, eventArrived);
             AssertJUnit.assertEquals("Number of success events", 7, inEventCount.get());
-            AssertJUnit.assertEquals("In events matched", true, SiddhiTestHelper.isEventsMatch(inEventsList, expected));
+            AssertJUnit.assertEquals("In events matched", true,
+                    SiddhiTestHelper.isEventsMatch(inEventsList, expected1) ||
+                            SiddhiTestHelper.isEventsMatch(inEventsList, expected2));
         } finally {
             siddhiAppRuntime.shutdown();
         }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/PersistenceTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/PersistenceTestCase.java
index 90be52be9f..3761bb1ecb 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/PersistenceTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/PersistenceTestCase.java
@@ -572,7 +572,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
                         AssertJUnit.assertEquals(300L, inEvent.getData(2));
                     }
                     if (count == 6) {
-                        AssertJUnit.assertEquals(300L, inEvent.getData(2));
+                        AssertJUnit.assertEquals(100L, inEvent.getData(2));
                     }
                 }
             }

From d1bb4a69659c14d71b1f88fd880ddcff1bfd9833 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Sun, 24 Mar 2019 08:46:41 +0530
Subject: [PATCH 07/21] Add groupBy cleaning function, improve group by perf
 better than 4.x.

Introduce synchronised and unsafe state holders.
---
 .../BaseIncrementalValueStore.java            |   8 +-
 .../IncrementalDataAggregator.java            |   8 +-
 ...mentalExternalTimestampDataAggregator.java |   8 +-
 .../siddhi/core/config/SiddhiAppContext.java  |  12 +-
 .../core/config/SiddhiQueryContext.java       |  21 +++-
 .../AttributeAggregatorExecutor.java          |  18 +--
 .../MaxAttributeAggregatorExecutor.java       |  56 ++++------
 ...MaxForeverAttributeAggregatorExecutor.java |  16 +--
 .../MinAttributeAggregatorExecutor.java       |  56 ++++------
 ...MinForeverAttributeAggregatorExecutor.java |  18 +--
 .../core/stream/output/StreamCallback.java    |   4 +-
 .../util/snapshot/state/EmptyStateHolder.java |   5 +
 .../snapshot/state/PartitionStateHolder.java  |  39 +++----
 .../state/PartitionSyncStateHolder.java       |  88 +++++++++++++++
 .../snapshot/state/SingleStateHolder.java     |  32 +++---
 .../snapshot/state/SingleSyncStateHolder.java | 103 ++++++++++++++++++
 .../core/util/snapshot/state/StateHolder.java |   2 +
 .../GroupByWindowSingleQueryPerformance.java  |  78 +++++++++++++
 18 files changed, 421 insertions(+), 151 deletions(-)
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionSyncStateHolder.java
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleSyncStateHolder.java
 create mode 100644 modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/GroupByWindowSingleQueryPerformance.java

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
index c85b17cdcc..40111aa5a5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
@@ -24,8 +24,8 @@
 import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
-import io.siddhi.core.util.snapshot.state.PartitionStateHolder;
-import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.PartitionSyncStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleSyncStateHolder;
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateHolder;
 
@@ -60,8 +60,8 @@ public BaseIncrementalValueStore(List<ExpressionExecutor> expressionExecutors,
             this.storeStateHolder = siddhiQueryContext.generateStateHolder(aggregatorName + "-" +
                     this.getClass().getName(), false, () -> new StoreState());
         } else {
-            this.valueStateHolder = new PartitionStateHolder(() -> new ValueState());
-            this.storeStateHolder = new SingleStateHolder(() -> new StoreState());
+            this.valueStateHolder = new PartitionSyncStateHolder(() -> new ValueState());
+            this.storeStateHolder = new SingleSyncStateHolder(() -> new StoreState());
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
index 451c17b269..eabef76965 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
@@ -28,8 +28,8 @@
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.util.IncrementalTimeConverterUtil;
 import io.siddhi.core.util.parser.AggregationParser;
-import io.siddhi.core.util.snapshot.state.PartitionStateHolder;
-import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.PartitionSyncStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleSyncStateHolder;
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.query.api.aggregation.TimePeriod;
@@ -73,9 +73,9 @@ public IncrementalDataAggregator(List<TimePeriod.Duration> incrementalDurations,
         this.baseExecutorsForFind = baseExecutorsForFind;
         streamEventPool = new StreamEventPool(metaStreamEvent, 10);
         if (groupBy) {
-            this.valueStateHolder = new PartitionStateHolder(() -> new ValueState());
+            this.valueStateHolder = new PartitionSyncStateHolder(() -> new ValueState());
         } else {
-            this.valueStateHolder = new SingleStateHolder(() -> new ValueState());
+            this.valueStateHolder = new SingleSyncStateHolder(() -> new ValueState());
         }
         this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
index 2b8b5f9fec..c179aee8b1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
@@ -27,8 +27,8 @@
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.query.selector.GroupByKeyGenerator;
 import io.siddhi.core.util.parser.AggregationParser;
-import io.siddhi.core.util.snapshot.state.PartitionStateHolder;
-import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.PartitionSyncStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleSyncStateHolder;
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateHolder;
 
@@ -68,9 +68,9 @@ public IncrementalExternalTimestampDataAggregator(List<ExpressionExecutor> baseE
 //                shouldUpdateExpressionExecutorForFind, -1, groupBy, true);
         this.groupByKeyGenerator = groupByKeyGenerator;
         if (groupByKeyGenerator != null) {
-            this.valueStateHolder = new PartitionStateHolder(() -> new ValueState());
+            this.valueStateHolder = new PartitionSyncStateHolder(() -> new ValueState());
         } else {
-            this.valueStateHolder = new SingleStateHolder(() -> new ValueState());
+            this.valueStateHolder = new SingleSyncStateHolder(() -> new ValueState());
         }
         this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
index 55309cc850..407adf90b7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
@@ -28,6 +28,7 @@
 import io.siddhi.core.util.snapshot.SnapshotService;
 import io.siddhi.core.util.snapshot.state.EmptyStateHolder;
 import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleSyncStateHolder;
 import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.core.util.statistics.StatisticsManager;
@@ -286,8 +287,17 @@ public List<Scheduler> getSchedulerList() {
     }
 
     public StateHolder generateStateHolder(String name, StateFactory stateFactory) {
+        return generateStateHolder(name, stateFactory, false);
+    }
+
+    public StateHolder generateStateHolder(String name, StateFactory stateFactory, boolean unSafe) {
         if (stateFactory != null) {
-            StateHolder stateHolder = new SingleStateHolder(stateFactory);
+            StateHolder stateHolder;
+            if (unSafe) {
+                stateHolder = new SingleStateHolder(stateFactory);
+            } else {
+                stateHolder = new SingleSyncStateHolder(stateFactory);
+            }
             if (SnapshotService.getSkipStateStorageThreadLocal().get() == null ||
                     !SnapshotService.getSkipStateStorageThreadLocal().get()) {
                 Map<String, StateHolder> stateHolderMap = getSnapshotService().getStateHolderMap(
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiQueryContext.java b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiQueryContext.java
index 387a822b48..636a278b62 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiQueryContext.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiQueryContext.java
@@ -23,7 +23,9 @@
 import io.siddhi.core.util.snapshot.SnapshotService;
 import io.siddhi.core.util.snapshot.state.EmptyStateHolder;
 import io.siddhi.core.util.snapshot.state.PartitionStateHolder;
+import io.siddhi.core.util.snapshot.state.PartitionSyncStateHolder;
 import io.siddhi.core.util.snapshot.state.SingleStateHolder;
+import io.siddhi.core.util.snapshot.state.SingleSyncStateHolder;
 import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.core.util.statistics.LatencyTracker;
@@ -106,13 +108,26 @@ public String generateNewId() {
     }
 
     public StateHolder generateStateHolder(String name, boolean groupBy, StateFactory stateFactory) {
+        return generateStateHolder(name, groupBy, stateFactory, false);
+    }
+
+    public StateHolder generateStateHolder(String name, boolean groupBy, StateFactory stateFactory, boolean unSafe) {
         if (stateFactory != null) {
             StateHolder stateHolder;
-            if (partitioned || groupBy) {
-                stateHolder = new PartitionStateHolder(stateFactory);
+            if (unSafe) {
+                if (partitioned || groupBy) {
+                    stateHolder = new PartitionStateHolder(stateFactory);
+                } else {
+                    stateHolder = new SingleStateHolder(stateFactory);
+                }
             } else {
-                stateHolder = new SingleStateHolder(stateFactory);
+                if (partitioned || groupBy) {
+                    stateHolder = new PartitionSyncStateHolder(stateFactory);
+                } else {
+                    stateHolder = new SingleSyncStateHolder(stateFactory);
+                }
             }
+
             if (SnapshotService.getSkipStateStorageThreadLocal().get() == null ||
                     !SnapshotService.getSkipStateStorageThreadLocal().get()) {
                 stateHolderMap = siddhiAppContext.getSnapshotService().getStateHolderMap(partitionId, this.getName());
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
index 4651ffd15e..917477ffbd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
@@ -27,8 +27,6 @@
 import io.siddhi.core.util.snapshot.state.StateFactory;
 import io.siddhi.core.util.snapshot.state.StateHolder;
 
-import java.util.Map;
-
 /**
  * Abstract parent class for attribute aggregators. Attribute aggregators are used to perform aggregate operations
  * such as count, average, etc.
@@ -49,7 +47,8 @@ public void initAggregator(ExpressionExecutor[] attributeExpressionExecutors, Pr
             this.attributeSize = attributeExpressionExecutors.length;
             StateFactory<S> stateFactory = init(attributeExpressionExecutors, processingMode,
                     outputExpectsExpiredEvents, configReader, siddhiQueryContext);
-            stateHolder = siddhiQueryContext.generateStateHolder(this.getClass().getName(), groupBy, stateFactory);
+            stateHolder = siddhiQueryContext.generateStateHolder(this.getClass().getName(),
+                    groupBy, stateFactory, true);
         } catch (Throwable t) {
             throw new SiddhiAppCreationException(t);
         }
@@ -142,16 +141,11 @@ private Object processRemove(Object[] data) {
     }
 
     private Object processReset() {
-        Object returnValue = null;
-        Map<String, S> states = stateHolder.getAllGroupByStates();
-        try {
-            for (S aState : states.values()) {
-                returnValue = reset(aState);
-            }
-        } finally {
-            stateHolder.returnGroupByStates(states);
+        S state = stateHolder.cleanGroupByStates();
+        if (state != null) {
+            return reset(state);
         }
-        return returnValue;
+        return null;
     }
 
     /**
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
index fba12258b9..4b4716362e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
@@ -159,7 +159,7 @@ public MaxAttributeAggregatorStateDouble(boolean trackFutureStates) {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Double value = (Double) data;
             if (maxDeque != null) {
                 for (Iterator<Double> iterator = maxDeque.descendingIterator(); iterator.hasNext(); ) {
@@ -178,7 +178,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             if (maxDeque != null) {
                 maxDeque.removeFirstOccurrence(data);
                 maxValue = maxDeque.peekFirst();
@@ -191,7 +191,7 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public synchronized Object reset() {
+        public Object reset() {
             if (maxDeque != null) {
                 maxDeque.clear();
             }
@@ -207,15 +207,13 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("MaxValue", maxValue);
-                state.put("MaxDeque", maxDeque);
-            }
+            state.put("MaxValue", maxValue);
+            state.put("MaxDeque", maxDeque);
             return state;
         }
 
         @Override
-        public synchronized void restore(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             maxValue = (Double) state.get("MaxValue");
             maxDeque = (Deque<Double>) state.get("MaxDeque");
         }
@@ -237,7 +235,7 @@ public MaxAttributeAggregatorStateFloat(boolean trackFutureStates) {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Float value = (Float) data;
             if (maxDeque != null) {
                 for (Iterator<Float> iterator = maxDeque.descendingIterator(); iterator.hasNext(); ) {
@@ -256,7 +254,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             if (maxDeque != null) {
                 maxDeque.removeFirstOccurrence(data);
                 maxValue = maxDeque.peekFirst();
@@ -269,7 +267,7 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public synchronized Object reset() {
+        public Object reset() {
             if (maxDeque != null) {
                 maxDeque.clear();
             }
@@ -285,15 +283,13 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("MaxValue", maxValue);
-                state.put("MaxDeque", maxDeque);
-            }
+            state.put("MaxValue", maxValue);
+            state.put("MaxDeque", maxDeque);
             return state;
         }
 
         @Override
-        public synchronized void restore(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             maxValue = (Float) state.get("MaxValue");
             maxDeque = (Deque<Float>) state.get("MaxDeque");
         }
@@ -316,7 +312,7 @@ public MaxAttributeAggregatorStateInt(boolean trackFutureStates) {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Integer value = (Integer) data;
             if (maxDeque != null) {
                 for (Iterator<Integer> iterator = maxDeque.descendingIterator(); iterator.hasNext(); ) {
@@ -335,7 +331,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             if (maxDeque != null) {
                 maxDeque.removeFirstOccurrence(data);
                 maxValue = maxDeque.peekFirst();
@@ -348,7 +344,7 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public synchronized Object reset() {
+        public Object reset() {
             if (maxDeque != null) {
                 maxDeque.clear();
             }
@@ -364,15 +360,13 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("MaxValue", maxValue);
-                state.put("MaxDeque", maxDeque);
-            }
+            state.put("MaxValue", maxValue);
+            state.put("MaxDeque", maxDeque);
             return state;
         }
 
         @Override
-        public synchronized void restore(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             maxValue = (Integer) state.get("MaxValue");
             maxDeque = (Deque<Integer>) state.get("MaxDeque");
         }
@@ -395,7 +389,7 @@ public MaxAttributeAggregatorStateLong(boolean trackFutureStates) {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Long value = (Long) data;
             if (maxDeque != null) {
                 for (Iterator<Long> iterator = maxDeque.descendingIterator(); iterator.hasNext(); ) {
@@ -414,7 +408,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             if (maxDeque != null) {
                 maxDeque.removeFirstOccurrence(data);
                 maxValue = maxDeque.peekFirst();
@@ -427,7 +421,7 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public synchronized Object reset() {
+        public Object reset() {
             if (maxDeque != null) {
                 maxDeque.clear();
             }
@@ -443,15 +437,13 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("MaxValue", maxValue);
-                state.put("MaxDeque", maxDeque);
-            }
+            state.put("MaxValue", maxValue);
+            state.put("MaxDeque", maxDeque);
             return state;
         }
 
         @Override
-        public synchronized void restore(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             maxValue = (Long) state.get("MaxValue");
             maxDeque = (Deque<Long>) state.get("MaxDeque");
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregatorExecutor.java
index bc5d1f2526..2743ccad55 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxForeverAttributeAggregatorExecutor.java
@@ -151,7 +151,7 @@ class MaxForeverAttributeAggregatorStateDouble extends MaxAggregatorState {
         private volatile Double maxValue = null;
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Double value = (Double) data;
             if (maxValue == null || maxValue < value) {
                 maxValue = value;
@@ -160,7 +160,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             Double value = (Double) data;
             if (maxValue == null || maxValue < value) {
                 maxValue = value;
@@ -201,7 +201,7 @@ class MaxForeverAttributeAggregatorStateFloat extends MaxAggregatorState {
         private volatile Float maxValue = null;
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Float value = (Float) data;
             if (maxValue == null || maxValue < value) {
                 maxValue = value;
@@ -210,7 +210,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             Float value = (Float) data;
             if (maxValue == null || maxValue < value) {
                 maxValue = value;
@@ -251,7 +251,7 @@ class MaxForeverAttributeAggregatorStateInt extends MaxAggregatorState {
         private volatile Integer maxValue = null;
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Integer value = (Integer) data;
             if (maxValue == null || maxValue < value) {
                 maxValue = value;
@@ -260,7 +260,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             Integer value = (Integer) data;
             if (maxValue == null || maxValue < value) {
                 maxValue = value;
@@ -300,7 +300,7 @@ class MaxForeverAttributeAggregatorStateLong extends MaxAggregatorState {
         private volatile Long maxValue = null;
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Long value = (Long) data;
             if (maxValue == null || maxValue < value) {
                 maxValue = value;
@@ -309,7 +309,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             Long value = (Long) data;
             if (maxValue == null || maxValue < value) {
                 maxValue = value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
index 02c3fc3235..3c29a0c098 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
@@ -167,7 +167,7 @@ public Attribute.Type getReturnType() {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Double value = (Double) data;
             if (minDeque != null) {
                 for (Iterator<Double> iterator = minDeque.descendingIterator(); iterator.hasNext(); ) {
@@ -186,7 +186,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             if (minDeque != null) {
                 minDeque.removeFirstOccurrence(data);
                 minValue = minDeque.peekFirst();
@@ -199,7 +199,7 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public synchronized Object reset() {
+        public Object reset() {
             if (minDeque != null) {
                 minDeque.clear();
             }
@@ -215,15 +215,13 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("MinValue", minValue);
-                state.put("MinDeque", minDeque);
-            }
+            state.put("MinValue", minValue);
+            state.put("MinDeque", minDeque);
             return state;
         }
 
         @Override
-        public synchronized void restore(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             minValue = (Double) state.get("MinValue");
             minDeque = (Deque<Double>) state.get("MinDeque");
         }
@@ -251,7 +249,7 @@ public Attribute.Type getReturnType() {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Float value = (Float) data;
             if (minDeque != null) {
                 for (Iterator<Float> iterator = minDeque.descendingIterator(); iterator.hasNext(); ) {
@@ -270,7 +268,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             if (minDeque != null) {
                 minDeque.removeFirstOccurrence(data);
                 minValue = minDeque.peekFirst();
@@ -283,7 +281,7 @@ public synchronized Object processRemove(Object data) {
         }
 
         @Override
-        public synchronized Object reset() {
+        public Object reset() {
             if (minDeque != null) {
                 minDeque.clear();
             }
@@ -299,15 +297,13 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("MinValue", minValue);
-                state.put("MinDeque", minDeque);
-            }
+            state.put("MinValue", minValue);
+            state.put("MinDeque", minDeque);
             return state;
         }
 
         @Override
-        public synchronized void restore(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             minValue = (Float) state.get("MinValue");
             minDeque = (Deque<Float>) state.get("MinDeque");
         }
@@ -334,7 +330,7 @@ public Attribute.Type getReturnType() {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Integer value = (Integer) data;
             if (minDeque != null) {
                 for (Iterator<Integer> iterator = minDeque.descendingIterator(); iterator.hasNext(); ) {
@@ -354,7 +350,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object reset() {
+        public Object reset() {
             if (minDeque != null) {
                 minDeque.clear();
             }
@@ -368,7 +364,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             if (minDeque != null) {
                 minDeque.removeFirstOccurrence(data);
                 minValue = minDeque.peekFirst();
@@ -383,15 +379,13 @@ public synchronized Object processRemove(Object data) {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("MinValue", minValue);
-                state.put("MinDeque", minDeque);
-            }
+            state.put("MinValue", minValue);
+            state.put("MinDeque", minDeque);
             return state;
         }
 
         @Override
-        public synchronized void restore(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             minValue = (Integer) state.get("MinValue");
             minDeque = (Deque<Integer>) state.get("MinDeque");
         }
@@ -418,7 +412,7 @@ public Attribute.Type getReturnType() {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Long value = (Long) data;
             if (minDeque != null) {
                 for (Iterator<Long> iterator = minDeque.descendingIterator(); iterator.hasNext(); ) {
@@ -437,7 +431,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object reset() {
+        public Object reset() {
             if (minDeque != null) {
                 minDeque.clear();
             }
@@ -451,7 +445,7 @@ public boolean canDestroy() {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             if (minDeque != null) {
                 minDeque.removeFirstOccurrence(data);
                 minValue = minDeque.peekFirst();
@@ -466,15 +460,13 @@ public synchronized Object processRemove(Object data) {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("MinValue", minValue);
-                state.put("MinDeque", minDeque);
-            }
+            state.put("MinValue", minValue);
+            state.put("MinDeque", minDeque);
             return state;
         }
 
         @Override
-        public synchronized void restore(Map<String, Object> state) {
+        public void restore(Map<String, Object> state) {
             minValue = (Long) state.get("MinValue");
             minDeque = (Deque<Long>) state.get("MinDeque");
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregatorExecutor.java
index 4b5a9f5e0c..b8da027c94 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinForeverAttributeAggregatorExecutor.java
@@ -71,7 +71,7 @@ public class MinForeverAttributeAggregatorExecutor
      * @param processingMode               query processing mode
      * @param outputExpectsExpiredEvents   is expired events sent as output
      * @param configReader                 this hold the {@link MinForeverAttributeAggregatorExecutor}
-     *                                    configuration reader.
+     *                                     configuration reader.
      * @param siddhiQueryContext           Siddhi query runtime context
      */
     @Override
@@ -153,7 +153,7 @@ public Attribute.Type getReturnType() {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Double value = (Double) data;
             if (minValue == null || minValue > value) {
                 minValue = value;
@@ -162,7 +162,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             Double value = (Double) data;
             if (minValue == null || minValue > value) {
                 minValue = value;
@@ -208,7 +208,7 @@ public Attribute.Type getReturnType() {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Float value = (Float) data;
             if (minValue == null || minValue > value) {
                 minValue = value;
@@ -217,7 +217,7 @@ public synchronized Object processAdd(Object data) {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             Float value = (Float) data;
             if (minValue == null || minValue > value) {
                 minValue = value;
@@ -262,7 +262,7 @@ public Attribute.Type getReturnType() {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Integer value = (Integer) data;
             if (minValue == null || minValue > value) {
                 minValue = value;
@@ -276,7 +276,7 @@ public Object reset() {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             Integer value = (Integer) data;
             if (minValue == null || minValue > value) {
                 minValue = value;
@@ -316,7 +316,7 @@ public Attribute.Type getReturnType() {
         }
 
         @Override
-        public synchronized Object processAdd(Object data) {
+        public Object processAdd(Object data) {
             Long value = (Long) data;
             if (minValue == null || minValue > value) {
                 minValue = value;
@@ -330,7 +330,7 @@ public Object reset() {
         }
 
         @Override
-        public synchronized Object processRemove(Object data) {
+        public Object processRemove(Object data) {
             Long value = (Long) data;
             if (minValue == null || minValue > value) {
                 minValue = value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/StreamCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/StreamCallback.java
index fcbe603d01..1fec58d8df 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/StreamCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/output/StreamCallback.java
@@ -128,11 +128,11 @@ public void receiveEvents(Event[] events) {
 
     public abstract void receive(Event[] events);
 
-    public synchronized void startProcessing() {
+    public void startProcessing() {
 
     }
 
-    public synchronized void stopProcessing() {
+    public void stopProcessing() {
 
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
index 6ad40f5577..5b61cc1264 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/EmptyStateHolder.java
@@ -52,6 +52,11 @@ public Map getAllGroupByStates() {
         return emptyMap;
     }
 
+    @Override
+    public State cleanGroupByStates() {
+        return null;
+    }
+
     @Override
     public void returnGroupByStates(Map states) {
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
index 50c41fdb14..b2ef1d0b5f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionStateHolder.java
@@ -32,7 +32,6 @@
  */
 public class PartitionStateHolder implements StateHolder {
     private static final Logger log = Logger.getLogger(PartitionStateHolder.class);
-
     private StateFactory stateFactory;
     private Map<String, Map<String, State>> states = new HashMap<>();
 
@@ -41,20 +40,17 @@ public PartitionStateHolder(StateFactory stateFactory) {
     }
 
     @Override
-    public synchronized State getState() {
+    public State getState() {
         String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
         String groupByFlowId = SiddhiAppContext.getGroupByFlowId();
         Map<String, State> partitionStates = states.computeIfAbsent(partitionFlowId, k -> new HashMap<>());
-        State state = partitionStates.computeIfAbsent(groupByFlowId, s -> stateFactory.createNewState());
-        state.activeUseCount++;
-        return state;
+        return partitionStates.computeIfAbsent(groupByFlowId, s -> stateFactory.createNewState());
     }
 
     @Override
-    public synchronized void returnState(State state) {
+    public void returnState(State state) {
         String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
         String groupByFlowId = SiddhiAppContext.getGroupByFlowId();
-        state.activeUseCount--;
         if (state.activeUseCount == 0) {
             try {
                 if (state.canDestroy()) {
@@ -82,34 +78,34 @@ private void removeState(String partitionFlowId, String groupByFlowId) {
         }
     }
 
-    public synchronized Map<String, Map<String, State>> getAllStates() {
-        for (Map<String, State> groupByStates : states.values()) {
-            for (State state : groupByStates.values()) {
-                state.activeUseCount++;
-            }
-        }
+    public Map<String, Map<String, State>> getAllStates() {
         return states;
     }
 
     @Override
-    public synchronized Map<String, State> getAllGroupByStates() {
+    public Map<String, State> getAllGroupByStates() {
+        String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
+        return states.computeIfAbsent(partitionFlowId, k -> new HashMap<>());
+    }
+
+    @Override
+    public State cleanGroupByStates() {
         String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
-        Map<String, State> groupByStates = states.computeIfAbsent(partitionFlowId, k -> new HashMap<>());
-        for (State state : groupByStates.values()) {
-            state.activeUseCount++;
+        Map<String, State> groupByStates = states.remove(partitionFlowId);
+        if (groupByStates != null) {
+            return groupByStates.values().stream().findFirst().orElse(null);
         }
-        return groupByStates;
+        return null;
     }
 
     @Override
-    public synchronized void returnGroupByStates(Map states) {
+    public void returnGroupByStates(Map states) {
         String partitionFlowId = SiddhiAppContext.getPartitionFlowId();
         for (Iterator<Map.Entry<String, State>> iterator =
              ((Set<Map.Entry<String, State>>) states.entrySet()).iterator();
              iterator.hasNext(); ) {
             Map.Entry<String, State> stateEntry = iterator.next();
             State state = stateEntry.getValue();
-            state.activeUseCount--;
             if (state.activeUseCount == 0) {
                 try {
                     if (state.canDestroy()) {
@@ -133,7 +129,7 @@ public synchronized void returnGroupByStates(Map states) {
     }
 
     @Override
-    public synchronized void returnAllStates(Map states) {
+    public void returnAllStates(Map states) {
         for (Iterator<Map.Entry<String, Map<String, State>>> statesIterator =
              ((Set<Map.Entry<String, Map<String, State>>>) states.entrySet()).iterator(); statesIterator.hasNext(); ) {
             Map.Entry<String, Map<String, State>> statesEntry = statesIterator.next();
@@ -141,7 +137,6 @@ public synchronized void returnAllStates(Map states) {
                  stateIterator.hasNext(); ) {
                 Map.Entry<String, State> stateEntry = stateIterator.next();
                 State state = stateEntry.getValue();
-                state.activeUseCount--;
                 if (state.activeUseCount == 0) {
                     try {
                         if (state.canDestroy()) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionSyncStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionSyncStateHolder.java
new file mode 100644
index 0000000000..e297c0cb4b
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/PartitionSyncStateHolder.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.util.snapshot.state;
+
+import java.util.Map;
+
+/**
+ * State holder for  partitioned use case
+ */
+public class PartitionSyncStateHolder implements StateHolder {
+    private PartitionStateHolder partitionStateHolder;
+
+    public PartitionSyncStateHolder(StateFactory stateFactory) {
+        partitionStateHolder = new PartitionStateHolder(stateFactory);
+    }
+
+    @Override
+    public synchronized State getState() {
+        State state = partitionStateHolder.getState();
+        state.activeUseCount++;
+        return state;
+    }
+
+    @Override
+    public synchronized void returnState(State state) {
+        state.activeUseCount--;
+        partitionStateHolder.returnState(state);
+    }
+
+
+    public synchronized Map<String, Map<String, State>> getAllStates() {
+        Map<String, Map<String, State>> states = partitionStateHolder.getAllStates();
+        for (Map<String, State> groupByStates : states.values()) {
+            for (State state : groupByStates.values()) {
+                state.activeUseCount++;
+            }
+        }
+        return states;
+    }
+
+    @Override
+    public synchronized Map<String, State> getAllGroupByStates() {
+        Map<String, State> groupByStates = partitionStateHolder.getAllGroupByStates();
+        for (State state : groupByStates.values()) {
+            state.activeUseCount++;
+        }
+        return groupByStates;
+    }
+
+    @Override
+    public synchronized State cleanGroupByStates() {
+        return partitionStateHolder.cleanGroupByStates();
+    }
+
+    @Override
+    public synchronized void returnGroupByStates(Map states) {
+        for (State state : ((Map<String, State>) states).values()) {
+            state.activeUseCount--;
+        }
+        partitionStateHolder.returnGroupByStates(states);
+    }
+
+    @Override
+    public synchronized void returnAllStates(Map states) {
+        for (Map<String, State> groupByStates : ((Map<String, Map<String, State>>) states).values()) {
+            for (State state : groupByStates.values()) {
+                state.activeUseCount--;
+            }
+        }
+        partitionStateHolder.returnAllStates(states);
+    }
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
index 8183fcaeef..ff0594daf5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleStateHolder.java
@@ -42,12 +42,8 @@ public SingleStateHolder(StateFactory stateFactory) {
     @Override
     public State getState() {
         if (state == null) {
-            synchronized (this) {
-                if (state == null) {
-                    state = stateFactory.createNewState();
-                    groupByStates.put(null, state);
-                }
-            }
+            state = stateFactory.createNewState();
+            groupByStates.put(null, state);
         }
         return state;
     }
@@ -59,12 +55,8 @@ public void returnState(State state) {
 
     public Map<String, Map<String, State>> getAllStates() {
         if (state == null) {
-            synchronized (this) {
-                if (state == null) {
-                    state = stateFactory.createNewState();
-                    groupByStates.put(null, state);
-                }
-            }
+            state = stateFactory.createNewState();
+            groupByStates.put(null, state);
         }
         return allStates;
     }
@@ -78,16 +70,20 @@ public void returnAllStates(Map states) {
     @Override
     public Map<String, State> getAllGroupByStates() {
         if (state == null) {
-            synchronized (this) {
-                if (state == null) {
-                    state = stateFactory.createNewState();
-                    groupByStates.put(null, state);
-                }
-            }
+            state = stateFactory.createNewState();
+            groupByStates.put(null, state);
         }
         return groupByStates;
     }
 
+    @Override
+    public State cleanGroupByStates() {
+        State returnValue = state;
+        state = null;
+        groupByStates.clear();
+        return returnValue;
+    }
+
     @Override
     public void returnGroupByStates(Map states) {
         //ignore
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleSyncStateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleSyncStateHolder.java
new file mode 100644
index 0000000000..5c1a68e2ff
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/SingleSyncStateHolder.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.util.snapshot.state;
+
+import org.apache.log4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * State holder for non partition use case
+ */
+public class SingleSyncStateHolder implements StateHolder {
+    private static final Logger log = Logger.getLogger(SingleSyncStateHolder.class);
+
+    private final StateFactory stateFactory;
+    private State state = null;
+    final Map<String, State> groupByStates = new HashMap<>(1);
+    final Map<String, Map<String, State>> allStates = new HashMap<>(1);
+
+    public SingleSyncStateHolder(StateFactory stateFactory) {
+        this.stateFactory = stateFactory;
+        this.allStates.put(null, groupByStates);
+    }
+
+    @Override
+    public State getState() {
+        if (state == null) {
+            synchronized (this) {
+                if (state == null) {
+                    state = stateFactory.createNewState();
+                    groupByStates.put(null, state);
+                }
+            }
+        }
+        return state;
+    }
+
+    @Override
+    public void returnState(State state) {
+        //ignore
+    }
+
+    public Map<String, Map<String, State>> getAllStates() {
+        if (state == null) {
+            synchronized (this) {
+                if (state == null) {
+                    state = stateFactory.createNewState();
+                    groupByStates.put(null, state);
+                }
+            }
+        }
+        return allStates;
+    }
+
+    @Override
+    public void returnAllStates(Map states) {
+        //ignore
+
+    }
+
+    @Override
+    public Map<String, State> getAllGroupByStates() {
+        if (state == null) {
+            synchronized (this) {
+                if (state == null) {
+                    state = stateFactory.createNewState();
+                    groupByStates.put(null, state);
+                }
+            }
+        }
+        return groupByStates;
+    }
+
+    @Override
+    public synchronized State cleanGroupByStates() {
+        State returnValue = state;
+        state = null;
+        groupByStates.clear();
+        return returnValue;
+    }
+
+    @Override
+    public void returnGroupByStates(Map states) {
+        //ignore
+    }
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
index b77528384f..77af0285e4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/state/StateHolder.java
@@ -37,5 +37,7 @@ public interface StateHolder<S extends State> {
 
     Map<String, S> getAllGroupByStates();
 
+    S cleanGroupByStates();
+
     void returnGroupByStates(Map<String, S> states);
 }
diff --git a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/GroupByWindowSingleQueryPerformance.java b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/GroupByWindowSingleQueryPerformance.java
new file mode 100644
index 0000000000..60752023bf
--- /dev/null
+++ b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/GroupByWindowSingleQueryPerformance.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package io.siddhi.performance;
+
+import io.siddhi.core.SiddhiAppRuntime;
+import io.siddhi.core.SiddhiManager;
+import io.siddhi.core.event.Event;
+import io.siddhi.core.stream.input.InputHandler;
+import io.siddhi.core.stream.output.StreamCallback;
+
+public class GroupByWindowSingleQueryPerformance {
+
+    public static void main(String[] args) throws InterruptedException {
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "define stream cseEventStream (symbol string, price float, volume int, timestamp long);" +
+                "" +
+                "@info(name = 'query1') " +
+                "from cseEventStream#window.lengthBatch(10) " +
+                "select symbol, sum(price) as total, avg(volume) as avgVolume, timestamp " +
+                "group by symbol " +
+                "insert into outputStream ;";
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+        siddhiAppRuntime.addCallback("outputStream", new StreamCallback() {
+            public int eventCount = 0;
+            public int timeSpent = 0;
+            long startTime = System.currentTimeMillis();
+
+            @Override
+            public void receive(Event[] events) {
+                for (Event event : events) {
+                    eventCount++;
+                    timeSpent += (System.currentTimeMillis() - (Long) event.getData(3));
+                    if (eventCount % 10000000 == 0) {
+                        System.out.println("Throughput : " + (eventCount * 1000) / ((System.currentTimeMillis()) -
+                                startTime));
+                        System.out.println("Time spent :  " + (timeSpent * 1.0 / eventCount));
+                        startTime = System.currentTimeMillis();
+                        eventCount = 0;
+                        timeSpent = 0;
+                    }
+                }
+            }
+        });
+
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("cseEventStream");
+        siddhiAppRuntime.start();
+        while (true) {
+            inputHandler.send(new Object[]{"WSO2", 55.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"FB", 100f, 80, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"GOOG", 55.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"WSO2", 100f, 80, System.currentTimeMillis()});
+            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+        }
+
+    }
+}

From b4e1d5ffbf83ada57ae285c3bce900cae038cd32 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Sun, 24 Mar 2019 08:47:55 +0530
Subject: [PATCH 08/21] Add groupBy cleaning function, improve group by perf
 better than 4.x.

Introduce synchronised and unsafe state holders.
---
 findbugs-exclude.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 3b42337aae..b6a2a448e8 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -189,7 +189,7 @@
         <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS"/>
     </Match>
     <Match>
-        <Class name="io.siddhi.core.util.snapshot.state.SingleStateHolder"/>
+        <Class name="io.siddhi.core.util.snapshot.state.SingleSyncStateHolder"/>
         <Bug pattern="DC_DOUBLECHECK"/>
     </Match>
 

From 7f9d964bb0d1a2054846ecf51b2d1c0876057b81 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Mon, 25 Mar 2019 15:24:27 +0530
Subject: [PATCH 09/21] Add perf tests

---
 .../SimpleFilterMultipleQueryPerformance.java |   2 +-
 ...erSingleQueryWithDisruptorPerformance.java |  80 -------------
 ...rtitionedDoubleFilterQueryPerformance.java | 113 ++++++++++++++++++
 ...plePartitionedFilterQueryPerformance.java} |  67 +++++------
 4 files changed, 147 insertions(+), 115 deletions(-)
 delete mode 100644 modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterSingleQueryWithDisruptorPerformance.java
 create mode 100644 modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedDoubleFilterQueryPerformance.java
 rename modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/{SimpleFilterMultipleQueryWithDisruptorPerformance.java => SimplePartitionedFilterQueryPerformance.java} (56%)

diff --git a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterMultipleQueryPerformance.java b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterMultipleQueryPerformance.java
index a48db0da27..db56d47be2 100644
--- a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterMultipleQueryPerformance.java
+++ b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterMultipleQueryPerformance.java
@@ -53,7 +53,7 @@ public void receive(Event[] events) {
                 for (Event event : events) {
                     eventCount++;
                     timeSpent += (System.currentTimeMillis() - (Long) event.getData(3));
-                    if (eventCount % 1000000 == 0) {
+                    if (eventCount % 10000000 == 0) {
                         System.out.println("Throughput : " + (eventCount * 1000) / ((System.currentTimeMillis()) -
                                 startTime));
                         System.out.println("Time spent :  " + (timeSpent * 1.0 / eventCount));
diff --git a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterSingleQueryWithDisruptorPerformance.java b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterSingleQueryWithDisruptorPerformance.java
deleted file mode 100644
index 804ed92728..0000000000
--- a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterSingleQueryWithDisruptorPerformance.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.performance;
-
-import io.siddhi.core.SiddhiAppRuntime;
-import io.siddhi.core.SiddhiManager;
-import io.siddhi.core.event.Event;
-import io.siddhi.core.stream.input.InputHandler;
-import io.siddhi.core.stream.output.StreamCallback;
-
-public class SimpleFilterSingleQueryWithDisruptorPerformance {
-
-    public static void main(String[] args) throws InterruptedException {
-        SiddhiManager siddhiManager = new SiddhiManager();
-
-        String siddhiApp = "" +
-                "@app:async " +
-                "" +
-                "define stream cseEventStream (symbol string, price float, volume long, timestamp long);" +
-                "" +
-                "@info(name = 'query1') " +
-                "from cseEventStream[700 > price] " +
-                "select * " +
-                "insert into outputStream ;";
-
-        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
-
-        siddhiAppRuntime.addCallback("outputStream", new StreamCallback() {
-            public int eventCount = 0;
-            public int timeSpent = 0;
-            long startTime = System.currentTimeMillis();
-
-            @Override
-            public void receive(Event[] events) {
-                for (Event event : events) {
-                    eventCount++;
-                    timeSpent += (System.currentTimeMillis() - (Long) event.getData(3));
-                    if (eventCount % 1000000 == 0) {
-                        System.out.println("Throughput : " + (eventCount * 1000) / ((System.currentTimeMillis()) -
-                                startTime));
-                        System.out.println("Time spent :  " + (timeSpent * 1.0 / eventCount));
-                        startTime = System.currentTimeMillis();
-                        eventCount = 0;
-                        timeSpent = 0;
-                    }
-                }
-            }
-
-        });
-
-        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("cseEventStream");
-        siddhiAppRuntime.start();
-        while (true) {
-            inputHandler.send(new Object[]{"WSO2", 55.6f, 100, System.currentTimeMillis()});
-            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
-            inputHandler.send(new Object[]{"WSO2", 100f, 80, System.currentTimeMillis()});
-            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
-            inputHandler.send(new Object[]{"WSO2", 55.6f, 100, System.currentTimeMillis()});
-            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
-            inputHandler.send(new Object[]{"WSO2", 100f, 80, System.currentTimeMillis()});
-            inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
-        }
-//        siddhiAppRuntime.shutdown();
-    }
-}
diff --git a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedDoubleFilterQueryPerformance.java b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedDoubleFilterQueryPerformance.java
new file mode 100644
index 0000000000..39521552f8
--- /dev/null
+++ b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedDoubleFilterQueryPerformance.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package io.siddhi.performance;
+
+import io.siddhi.core.SiddhiAppRuntime;
+import io.siddhi.core.SiddhiManager;
+import io.siddhi.core.event.Event;
+import io.siddhi.core.stream.input.InputHandler;
+import io.siddhi.core.stream.output.StreamCallback;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class SimplePartitionedDoubleFilterQueryPerformance {
+
+    public static void main(String[] args) throws InterruptedException {
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "define stream cseEventStream (symbol string, price float, volume long, timestamp long);" +
+                "" +
+                "partition with (symbol of cseEventStream) " +
+                "begin " +
+                "   @info(name = 'query1') " +
+                "   from cseEventStream[700 > price] " +
+                "   select * " +
+                "   insert into #innerOutputStream ; " +
+                "" +
+                "   @info(name = 'query2') " +
+                "   from #innerOutputStream[700 > price] " +
+                "   select * " +
+                "   insert into outputStream ;" +
+                "end;";
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+        siddhiAppRuntime.addCallback("outputStream", new StreamCallback() {
+            public AtomicInteger eventCount = new AtomicInteger();
+            public int timeSpent = 0;
+            long startTime = System.currentTimeMillis();
+
+            @Override
+            public void receive(Event[] events) {
+                for (Event event : events) {
+                    int count = eventCount.incrementAndGet();
+                    timeSpent += (System.currentTimeMillis() - (Long) event.getData(3));
+                    if (count % 10000000 == 0) {
+                        System.out.println("Throughput : " + (count * 1000) / ((System.currentTimeMillis()) -
+                                startTime));
+                        System.out.println("Time spent :  " + (timeSpent * 1.0 / count));
+                        startTime = System.currentTimeMillis();
+                        eventCount.set(0);
+                        timeSpent = 0;
+                    }
+                }
+            }
+        });
+
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("cseEventStream");
+        siddhiAppRuntime.start();
+
+        for (int i = 0; i <= 10; i++) {
+            EventPublisher eventPublisher = new EventPublisher(inputHandler);
+            eventPublisher.start();
+        }
+        //siddhiAppRuntime.shutdown();
+    }
+
+
+    static class EventPublisher extends Thread {
+
+        InputHandler inputHandler;
+
+        EventPublisher(InputHandler inputHandler) {
+            this.inputHandler = inputHandler;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                try {
+                    inputHandler.send(new Object[]{"1", 55.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"2", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"3", 100f, 80, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"4", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"5", 55.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"6", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"7", 100f, 80, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"8", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"9", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"10", 75.6f, 100, System.currentTimeMillis()});
+                } catch (InterruptedException e) {
+                    e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+                }
+            }
+
+        }
+    }
+}
diff --git a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterMultipleQueryWithDisruptorPerformance.java b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedFilterQueryPerformance.java
similarity index 56%
rename from modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterMultipleQueryWithDisruptorPerformance.java
rename to modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedFilterQueryPerformance.java
index 106a17b2ee..1fa0114c0b 100644
--- a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimpleFilterMultipleQueryWithDisruptorPerformance.java
+++ b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedFilterQueryPerformance.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -23,64 +23,60 @@
 import io.siddhi.core.stream.input.InputHandler;
 import io.siddhi.core.stream.output.StreamCallback;
 
-public class SimpleFilterMultipleQueryWithDisruptorPerformance {
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class SimplePartitionedFilterQueryPerformance {
 
     public static void main(String[] args) throws InterruptedException {
         SiddhiManager siddhiManager = new SiddhiManager();
 
         String siddhiApp = "" +
-                "@app:async" +
-                " " +
-                "define stream cseEventStream (symbol string, price float, volume int, timestamp long);" +
-                "" +
-                "@info(name = 'query1') " +
-                "from cseEventStream[70 > price] " +
-                "select * " +
-                "insert into outputStream ;" +
+                "define stream cseEventStream (symbol string, price float, volume long, timestamp long);" +
                 "" +
-                "@info(name = 'query2') " +
-                "from cseEventStream[volume > 90] " +
-                "select * " +
-                "insert into outputStream ;";
+                "partition with (symbol of cseEventStream) " +
+                "begin " +
+                "   @info(name = 'query1') " +
+                "   from cseEventStream[700 > price] " +
+                "   select * " +
+                "   insert into outputStream ;" +
+                "end;";
 
         SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
-
         siddhiAppRuntime.addCallback("outputStream", new StreamCallback() {
-            public int eventCount = 0;
+            public AtomicInteger eventCount = new AtomicInteger();
             public int timeSpent = 0;
             long startTime = System.currentTimeMillis();
 
             @Override
             public void receive(Event[] events) {
                 for (Event event : events) {
-                    eventCount++;
+                    int count = eventCount.incrementAndGet();
                     timeSpent += (System.currentTimeMillis() - (Long) event.getData(3));
-                    if (eventCount % 1000000 == 0) {
-                        System.out.println("Throughput : " + (eventCount * 1000) / ((System.currentTimeMillis()) -
+                    if (count % 10000000 == 0) {
+                        System.out.println("Throughput : " + (count * 1000) / ((System.currentTimeMillis()) -
                                 startTime));
-                        System.out.println("Time spent :  " + (timeSpent * 1.0 / eventCount));
+                        System.out.println("Time spent :  " + (timeSpent * 1.0 / count));
                         startTime = System.currentTimeMillis();
-                        eventCount = 0;
+                        eventCount.set(0);
                         timeSpent = 0;
                     }
                 }
             }
-
         });
 
+
         InputHandler inputHandler = siddhiAppRuntime.getInputHandler("cseEventStream");
         siddhiAppRuntime.start();
 
-
         for (int i = 0; i <= 100; i++) {
             EventPublisher eventPublisher = new EventPublisher(inputHandler);
-            eventPublisher.run();
+            eventPublisher.start();
         }
         //siddhiAppRuntime.shutdown();
     }
 
 
-    static class EventPublisher implements Runnable {
+    static class EventPublisher extends Thread {
 
         InputHandler inputHandler;
 
@@ -92,18 +88,21 @@ static class EventPublisher implements Runnable {
         public void run() {
             while (true) {
                 try {
-                    inputHandler.send(new Object[]{"WSO2", 55.6f, 100, System.currentTimeMillis()});
-                    inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
-                    inputHandler.send(new Object[]{"WSO2", 100f, 80, System.currentTimeMillis()});
-                    inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
-                    inputHandler.send(new Object[]{"WSO2", 55.6f, 100, System.currentTimeMillis()});
-                    inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
-                    inputHandler.send(new Object[]{"WSO2", 100f, 80, System.currentTimeMillis()});
-                    inputHandler.send(new Object[]{"IBM", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"1", 55.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"2", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"3", 100f, 80, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"4", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"5", 55.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"6", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"7", 100f, 80, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"8", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"9", 75.6f, 100, System.currentTimeMillis()});
+                    inputHandler.send(new Object[]{"10", 75.6f, 100, System.currentTimeMillis()});
                 } catch (InterruptedException e) {
                     e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
                 }
             }
+
         }
     }
 }

From fce0c1f7b988e13688b2a0b7e21e4c0da975f433 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Tue, 26 Mar 2019 23:07:05 +0530
Subject: [PATCH 10/21] Remove unnecessary synchronizations

---
 checkstyle-suppressions.xml                   |   4 +-
 .../java/io/siddhi/core/SiddhiAppRuntime.java |   2 +-
 .../BaseIncrementalValueStore.java            |  47 ----
 .../IncrementalDataAggregator.java            |  77 +------
 .../core/aggregation/IncrementalExecutor.java |  54 -----
 ...mentalExternalTimestampDataAggregator.java |  77 +------
 .../siddhi/core/config/SiddhiAppContext.java  |   2 +-
 .../core/event/stream/StreamEventFactory.java |  11 +
 .../InConditionExpressionExecutor.java        |   5 +-
 .../core/partition/PartitionRuntime.java      | 126 +----------
 .../partition/PartitionStreamReceiver.java    |  63 +++---
 .../input/MultiProcessStreamReceiver.java     | 214 ++++++------------
 .../input/SingleProcessStreamReceiver.java    |  15 +-
 .../StateMultiProcessStreamReceiver.java      |   5 +-
 .../state/AbsentStreamPreStateProcessor.java  |   8 +-
 .../PatternMultiProcessStreamReceiver.java    |  33 +--
 .../PatternSingleProcessStreamReceiver.java   |  34 +--
 .../SequenceMultiProcessStreamReceiver.java   |  32 +--
 .../SequenceSingleProcessStreamReceiver.java  |  32 +--
 .../output/callback/DeleteTableCallback.java  |   2 +-
 .../query/output/callback/OutputCallback.java |  15 +-
 .../query/output/callback/QueryCallback.java  |   8 -
 .../output/callback/UpdateTableCallback.java  |   2 +-
 ...FirstGroupByPerEventOutputRateLimiter.java |  18 +-
 .../LastGroupByPerEventOutputRateLimiter.java |   6 +-
 ...yWindowedPerSnapshotOutputRateLimiter.java |   6 +-
 ...nWindowedPerSnapshotOutputRateLimiter.java |  54 +++--
 ...yWindowedPerSnapshotOutputRateLimiter.java |   4 +-
 ...gregationPerSnapshotOutputRateLimiter.java |   4 +-
 .../GroupByPerSnapshotOutputRateLimiter.java  |  28 ++-
 .../PerSnapshotOutputRateLimiter.java         |   4 +-
 .../WindowedPerSnapshotOutputRateLimiter.java |   4 +-
 .../time/AllPerTimeOutputRateLimiter.java     |   4 +-
 .../FirstGroupByPerTimeOutputRateLimiter.java |   6 +-
 .../time/FirstPerTimeOutputRateLimiter.java   |   4 +-
 .../LastGroupByPerTimeOutputRateLimiter.java  |   4 +-
 .../time/LastPerTimeOutputRateLimiter.java    |   4 +-
 .../stream/window/BatchWindowProcessor.java   |   2 +-
 .../ExternalTimeBatchWindowProcessor.java     |  18 +-
 .../window/FrequentWindowProcessor.java       |   4 +-
 .../window/LengthBatchWindowProcessor.java    |  10 +-
 .../stream/window/LengthWindowProcessor.java  |   8 +-
 .../window/LossyFrequentWindowProcessor.java  |  10 +-
 .../stream/window/SortWindowProcessor.java    |   4 +-
 .../window/TimeBatchWindowProcessor.java      |   8 +-
 .../AttributeAggregatorExecutor.java          |   2 +-
 .../io/siddhi/core/stream/StreamJunction.java |  39 ++--
 .../IncrementalAggregateCompileCondition.java |  24 +-
 .../core/util/parser/AggregationParser.java   |   9 -
 .../util/parser/JoinInputStreamParser.java    |   4 +-
 .../core/util/parser/SelectorParser.java      |  15 +-
 .../util/parser/StateInputStreamParser.java   |  11 +-
 .../util/parser/helper/QueryParserHelper.java |   2 +-
 .../core/util/snapshot/SnapshotService.java   |  20 +-
 .../timestamp/TimestampGeneratorImpl.java     |   3 +-
 .../io/siddhi/core/query/FilterTestCase1.java |   2 -
 .../core/query/PassThroughTestCase.java       |   2 -
 .../TimeOutputRateLimitTestCase.java          |  26 +--
 .../core/window/SessionWindowTestCase.java    |   6 +-
 ...mplePartitionedFilterQueryPerformance.java |   2 +-
 pom.xml                                       |   2 +-
 61 files changed, 299 insertions(+), 952 deletions(-)

diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index f76bb72a1e..d8f2437f1c 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -24,8 +24,8 @@
 <suppressions>
 
     <suppress checks="Javadoc.*" files=".*[/\\]src[/\\]test[/\\]java[/\\].*"/>
-    <suppress checks=".*" files=".*[/\\]antlr4[/\\]io[/\\]siddhi[/\\]query[/\\]compiler[/\\]*" />
-    <suppress checks=".*" files=".*[/\\]src[/\\]gen[/\\]java[/\\]io[/\\]siddhi[/\\]service[/\\]*" />
+    <suppress checks=".*" files=".*[/\\]antlr4[/\\]io[/\\]siddhi[/\\]query[/\\]compiler[/\\]*"/>
+    <suppress checks=".*" files=".*[/\\]src[/\\]gen[/\\]java[/\\]io[/\\]siddhi[/\\]service[/\\]*"/>
 
     <suppress checks="JavadocPackage" files=".*[/\\]src[/\\](main|integration)[/\\]java[/\\].*"/>
     <suppress checks="JavadocPackage" files=".*[/\\]src[/\\].*[/\\]internal[/\\].*"/>
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/SiddhiAppRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/SiddhiAppRuntime.java
index 9c2d8e5056..776f7bf9c7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/SiddhiAppRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/SiddhiAppRuntime.java
@@ -428,7 +428,7 @@ public void setPurgingEnabled(boolean purgingEnabled) {
         this.incrementalDataPurging = purgingEnabled;
     }
 
-    public synchronized void startSources() {
+    public void startSources() {
         if (running) {
             log.warn("Error calling startSources() for Siddhi App '" + siddhiAppContext.getName() + "', " +
                     "SiddhiApp already started with the sources.");
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
index 40111aa5a5..f02dd2a7c7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
@@ -173,23 +173,6 @@ public void process(StreamEvent streamEvent) {
         } finally {
             valueStateHolder.returnState(state);
         }
-//        List<ExpressionExecutor> expressionExecutors = baseIncrementalValueStore.getExpressionExecutors();
-//        boolean shouldUpdate = baseIncrementalValueStore.;
-//        if (shouldUpdateExpressionExecutor != null) {
-//            shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
-//        }
-//        baseIncrementalValueStore.setProcessed(true);
-//        for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
-//            if (shouldUpdate) {
-//                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-//                baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-//            } else {
-//                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-//                if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
-//                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-//                }
-//            }
-//        }
     }
 
     public void process(Map<String, StreamEvent> groupedByEvents) {
@@ -248,36 +231,6 @@ public Object shouldUpdate(Object data) {
 
     }
 
-//    public void process() {
-//        ValueStoreState state = this.stateHolder.getState();
-//        try {
-//            StreamEvent streamEvent = streamEventPool.borrowEvent();
-//            streamEvent.setTimestamp(state.timestamp);
-//            state.setValue(state.timestamp, 0);
-//            streamEvent.setOutputData(state.values);
-//
-//            boolean shouldUpdate = true;
-//            if (shouldUpdateExpressionExecutor != null) {
-//                shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
-//            }
-//
-//            for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
-//                if (shouldUpdate) {
-//                    ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-//                    state.setValue(expressionExecutor.execute(streamEvent), i + 1);
-//                } else {
-//                    ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-//                    if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
-//                        state.setValue(expressionExecutor.execute(streamEvent), i + 1);
-//                    }
-//                }
-//            }
-//            state.isProcessed = true;
-//        } finally {
-//            this.stateHolder.returnState(state);
-//        }
-//    }
-
     class StoreState extends State {
         private long timestamp;
         private boolean isProcessed = false;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
index eabef76965..de675fdc3d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
@@ -19,7 +19,6 @@
 package io.siddhi.core.aggregation;
 
 import io.siddhi.core.config.SiddhiAppContext;
-import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
@@ -50,21 +49,17 @@
 public class IncrementalDataAggregator {
     private final List<TimePeriod.Duration> incrementalDurations;
     private final TimePeriod.Duration durationToAggregate;
-    //    private final long oldestEventTimestamp;
     private final List<ExpressionExecutor> baseExecutorsForFind;
-    //    private final BaseIncrementalValueStore baseIncrementalValueStore;
-//    private final ExpressionExecutor shouldUpdateExpressionExecutorForFind;
     private final StateHolder valueStateHolder;
     private final StreamEvent resetEvent;
     private final long oldestEventTimestamp;
     private ExpressionExecutor shouldUpdateTimestamp;
     private final StreamEventPool streamEventPool;
-//    private long lastTimestamp = 0;
 
     public IncrementalDataAggregator(List<TimePeriod.Duration> incrementalDurations,
                                      TimePeriod.Duration durationToAggregate, long oldestEventTimestamp,
                                      List<ExpressionExecutor> baseExecutorsForFind,
-                                     MetaStreamEvent metaStreamEvent, SiddhiQueryContext siddhiQueryContext,
+                                     MetaStreamEvent metaStreamEvent,
                                      ExpressionExecutor shouldUpdateTimestamp,
                                      boolean groupBy) {
         this.incrementalDurations = incrementalDurations;
@@ -78,15 +73,7 @@ public IncrementalDataAggregator(List<TimePeriod.Duration> incrementalDurations,
             this.valueStateHolder = new SingleSyncStateHolder(() -> new ValueState());
         }
         this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
-
-//        this.values = new Object[baseExecutorsForFind.size() + 1];
         this.shouldUpdateTimestamp = shouldUpdateTimestamp;
-//        this.baseIncrementalValueStore = new BaseIncrementalValueStore(baseExecutorsForFind,
-//                streamEventPool, siddhiQueryContext, null, shouldUpdateExpressionExecutorForFind,
-//                oldestEventTimestamp, groupBy, true);
-//        this.shouldUpdateExpressionExecutorForFind = shouldUpdateExpressionExecutorForFind;
-
-
     }
 
     public ComplexEventChunk<StreamEvent> aggregateInMemoryData(
@@ -99,28 +86,6 @@ public ComplexEventChunk<StreamEvent> aggregateInMemoryData(
 
             BaseIncrementalValueStore aBaseIncrementalValueStore = incrementalExecutor.getBaseIncrementalValueStore();
             Map<String, StreamEvent> groupedByEvents = aBaseIncrementalValueStore.getGroupedByEvents();
-//            process(groupedByEvents);
-//            baseIncrementalValueStore.process(groupedByEvents);
-
-//            Map<String, BaseIncrementalValueStore> baseIncrementalValueStoreGroupByMap = null;
-//            if (incrementalExecutor.getBaseIncrementalValueStoreGroupByMap() != null) {
-//                baseIncrementalValueStoreGroupByMap
-//                        = new HashMap<>(incrementalExecutor.getBaseIncrementalValueStoreGroupByMap());
-//            }
-//            if (baseIncrementalValueStoreGroupByMap != null) {
-//                for (Map.Entry<String, BaseIncrementalValueStore> entry :
-//                        baseIncrementalValueStoreGroupByMap.entrySet()) {
-//                    BaseIncrementalValueStore aBaseIncrementalValueStore = entry.getValue();
-//                    if (aBaseIncrementalValueStore.isProcessed()) {
-//                        processInMemoryAggregates(aBaseIncrementalValueStore.createStreamEvent(),
-//                                aBaseIncrementalValueStore.getTimestamp(), entry.getKey());
-//                    }
-//                }
-//            } else if (baseIncrementalValueStore.isProcessed()) {
-//            baseIncrementalValueStore.process(baseIncrementalValueStore.createStreamEvent(), )
-//                processInMemoryAggregates(baseIncrementalValueStore.createStreamEvent(),
-//                        baseIncrementalValueStore.getTimestamp(), null);
-//            }
             for (Map.Entry<String, StreamEvent> eventEntry : groupedByEvents.entrySet()) {
                 long startTimeOfAggregates = IncrementalTimeConverterUtil.getStartTimeOfAggregates(
                         eventEntry.getValue().getTimestamp(), durationToAggregate);
@@ -156,7 +121,6 @@ public ComplexEventChunk<StreamEvent> aggregateInMemoryData(
                 }
             }
         }
-//        shouldUpdateExpressionExecutorForFind.execute(streamEventPool.borrowEvent());
         //clean all executors
         for (String groupByKey : groupByKeys) {
             SiddhiAppContext.startGroupByFlow(groupByKey);
@@ -169,14 +133,9 @@ public ComplexEventChunk<StreamEvent> aggregateInMemoryData(
             }
         }
         return getProcessedEventChunk();
-//        return baseIncrementalValueStore.getProcessedEventChunk();
     }
 
 
-//    private void process(Map<String, StreamEvent> groupedByEvents) {
-//
-//    }
-
     private ComplexEventChunk<StreamEvent> getProcessedEventChunk() {
         ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(true);
         Map<String, State> valueStoreMap = this.valueStateHolder.getAllGroupByStates();
@@ -206,40 +165,6 @@ private Object shouldUpdate(Object data, ValueState state) {
         return false;
     }
 
-//    private void processInMemoryAggregates(StreamEvent streamEvent, long timestamp, String groupByKey) {
-//        long startTimeOfAggregates = IncrementalTimeConverterUtil.getStartTimeOfAggregates(timestamp,
-//                durationToAggregate);
-//        synchronized (this) {
-//            if (groupByKey != null) {
-//
-//                BaseIncrementalValueStore aBaseIncrementalValueStore =
-//                        this.baseIncrementalValueStoreGroupByMap.computeIfAbsent(
-//                                groupByKey, k -> baseIncrementalValueStore.cloneStore(k, startTimeOfAggregates));
-//                process(streamEvent, aBaseIncrementalValueStore, startTimeOfAggregates);
-//            } else {
-//                baseIncrementalValueStore.process(streamEvent, startTimeOfAggregates);
-//                process(streamEvent, this.baseIncrementalValueStore, startTimeOfAggregates);
-//            }
-//        }
-//    }
-
-
-//    private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
-//        ComplexEventChunk<StreamEvent> processedInMemoryEventChunk = new ComplexEventChunk<>(true);
-//        baseIncrementalValueStore
-//        if (this.baseIncrementalValueStoreGroupByMap.size() == 0) {
-//            if (this.baseIncrementalValueStore.isProcessed()) {
-//                processedInMemoryEventChunk.add(this.baseIncrementalValueStore.createStreamEvent());
-//            }
-//        } else {
-//            for (Map.Entry<String, BaseIncrementalValueStore> entryAgainstGroupBy :
-//                    baseIncrementalValueStoreGroupByMap.entrySet()) {
-//                processedInMemoryEventChunk.add(entryAgainstGroupBy.getValue().createStreamEvent());
-//            }
-//        }
-//        return processedInMemoryEventChunk;
-//    }
-
     class ValueState extends State {
         private Object[] values;
         public long lastTimestamp;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
index 121fc9e871..cdc7bed764 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
@@ -48,18 +48,15 @@ public class IncrementalExecutor implements Executor {
 
     private final StreamEvent resetEvent;
     private final ExpressionExecutor timestampExpressionExecutor;
-    private final String aggregatorName;
     private final StateHolder<ExecutorState> stateHolder;
     private TimePeriod.Duration duration;
     private Table table;
     private GroupByKeyGenerator groupByKeyGenerator;
     private StreamEventPool streamEventPool;
-    //    private boolean groupBy;
     private Executor next;
     private Scheduler scheduler;
     private boolean isRoot;
     private boolean isProcessingExecutor;
-    private SiddhiQueryContext siddhiQueryContext;
 
     private BaseIncrementalValueStore baseIncrementalValueStore = null;
 
@@ -72,15 +69,10 @@ public IncrementalExecutor(TimePeriod.Duration duration, List<ExpressionExecutor
         this.next = child;
         this.isRoot = isRoot;
         this.table = table;
-        this.siddhiQueryContext = siddhiQueryContext;
-        this.aggregatorName = aggregatorName;
         this.streamEventPool = new StreamEventPool(metaStreamEvent, 10);
         this.timestampExpressionExecutor = processExpressionExecutors.remove(0);
         this.isProcessingExecutor = false;
-//        if (groupByKeyGenerator != null) {
-//            this.groupBy = true;
         this.groupByKeyGenerator = groupByKeyGenerator;
-//        }
         this.baseIncrementalValueStore = new BaseIncrementalValueStore(processExpressionExecutors, streamEventPool,
                 siddhiQueryContext, aggregatorName, shouldUpdateTimestamp, -1, true, false);
         this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
@@ -169,29 +161,19 @@ private void processAggregates(StreamEvent streamEvent, ExecutorState executorSt
                 try {
                     String groupedByKey = groupByKeyGenerator.constructEventKey(streamEvent);
                     SiddhiAppContext.startGroupByFlow(groupedByKey);
-//                    GroupByAggregationAttributeExecutor.getKeyThreadLocal().set(groupedByKey);
                     baseIncrementalValueStore.process(streamEvent);
-//                    process(streamEvent, baseIncrementalValueStore);
                 } finally {
                     SiddhiAppContext.stopGroupByFlow();
-//                    GroupByAggregationAttributeExecutor.getKeyThreadLocal().remove();
                 }
             } else {
                 baseIncrementalValueStore.process(streamEvent);
-
-//                process(streamEvent, baseIncrementalValueStore);
             }
         }
     }
 
 
     private void dispatchAggregateEvents(long startTimeOfNewAggregates) {
-//        if (groupBy) {
-//        dispatchEvent(startTimeOfNewAggregates, baseIncrementalValueStore);
-//            dispatchEvents(baseIncrementalValueStoreGroupByMap);
-//        } else {
         dispatchEvent(startTimeOfNewAggregates, baseIncrementalValueStore);
-//        }
     }
 
     private void dispatchEvent(long startTimeOfNewAggregates, BaseIncrementalValueStore aBaseIncrementalValueStore) {
@@ -214,44 +196,14 @@ private void dispatchEvent(long startTimeOfNewAggregates, BaseIncrementalValueSt
         cleanBaseIncrementalValueStore(startTimeOfNewAggregates, aBaseIncrementalValueStore);
     }
 
-//    private void dispatchEvents(Map<String, BaseIncrementalValueStore> baseIncrementalValueGroupByStore) {
-//        int noOfEvents = baseIncrementalValueGroupByStore.size();
-//        if (noOfEvents > 0) {
-//            ComplexEventChunk<StreamEvent> eventChunk = new ComplexEventChunk<>(true);
-//            for (BaseIncrementalValueStore aBaseIncrementalValueStore : baseIncrementalValueGroupByStore.values()) {
-//                StreamEvent streamEvent = aBaseIncrementalValueStore.createStreamEvent();
-//                eventChunk.add(streamEvent);
-//            }
-//            if (LOG.isDebugEnabled()) {
-//                LOG.debug("Event dispatched by " + this.duration + " incremental executor: " + eventChunk.toString());
-//            }
-//            if (isProcessingExecutor) {
-//                table.addEvents(eventChunk, noOfEvents);
-//            }
-//            if (getNextExecutor() != null) {
-//                next.execute(eventChunk);
-//            }
-//        }
-//        for (BaseIncrementalValueStore baseIncrementalValueStore : baseIncrementalValueGroupByStore.values()) {
-//            baseIncrementalValueStore.clean();
-//        }
-//        baseIncrementalValueGroupByStore.clear();
-//    }
-
     private void cleanBaseIncrementalValueStore(long startTimeOfNewAggregates,
                                                 BaseIncrementalValueStore baseIncrementalValueStore) {
         baseIncrementalValueStore.clearValues(startTimeOfNewAggregates, resetEvent);
-//        baseIncrementalValueStore.setProcessed(false);
         for (ExpressionExecutor expressionExecutor : baseIncrementalValueStore.getExpressionExecutors()) {
             expressionExecutor.execute(resetEvent);
         }
     }
 
-
-//    Map<String, BaseIncrementalValueStore> getBaseIncrementalValueStoreGroupByMap() {
-//        return baseIncrementalValueStoreGroupByMap;
-//    }
-
     BaseIncrementalValueStore getBaseIncrementalValueStore() {
         return baseIncrementalValueStore;
     }
@@ -292,13 +244,7 @@ public void setProcessingExecutor(boolean processingExecutor) {
     }
 
     public void clearExecutor() {
-//        if (groupBy) {
-//            this.baseIncrementalValueStoreGroupByMap.clear();
-//        } else {
-//        if (!groupBy) {
         cleanBaseIncrementalValueStore(-1, this.baseIncrementalValueStore);
-//        }
-//        }
     }
 
     class ExecutorState extends State {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
index c179aee8b1..5c327f17a1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
@@ -48,8 +48,6 @@ public class IncrementalExternalTimestampDataAggregator {
     private final List<ExpressionExecutor> baseExecutors;
     private final StateHolder valueStateHolder;
     private final StreamEvent resetEvent;
-    //    private final BaseIncrementalValueStore baseIncrementalValueStore;
-//    private final ExpressionExecutor shouldUpdateExpressionExecutorForFind;
     private StreamEventPool streamEventPool;
     private final ExpressionExecutor shouldUpdateTimestamp;
 
@@ -59,13 +57,8 @@ public IncrementalExternalTimestampDataAggregator(List<ExpressionExecutor> baseE
                                                       SiddhiQueryContext siddhiQueryContext,
                                                       ExpressionExecutor shouldUpdateTimestamp) {
         this.baseExecutors = baseExecutors.subList(1, baseExecutors.size());
-        streamEventPool = new StreamEventPool(metaStreamEvent, 10);
+        this.streamEventPool = new StreamEventPool(metaStreamEvent, 10);
         this.shouldUpdateTimestamp = shouldUpdateTimestamp;
-
-//        List<ExpressionExecutor> expressionExecutorsWithoutTime = baseExecutors.subList(1, baseExecutors.size());
-//        this.baseIncrementalValueStore = new BaseIncrementalValueStore(
-//                expressionExecutorsWithoutTime, streamEventPool, siddhiQueryContext, null,
-//                shouldUpdateExpressionExecutorForFind, -1, groupBy, true);
         this.groupByKeyGenerator = groupByKeyGenerator;
         if (groupByKeyGenerator != null) {
             this.valueStateHolder = new PartitionSyncStateHolder(() -> new ValueState());
@@ -73,8 +66,6 @@ public IncrementalExternalTimestampDataAggregator(List<ExpressionExecutor> baseE
             this.valueStateHolder = new SingleSyncStateHolder(() -> new ValueState());
         }
         this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
-
-//        this.shouldUpdateExpressionExecutorForFind = shouldUpdateExpressionExecutorForFind;
     }
 
     public ComplexEventChunk<StreamEvent> aggregateData(ComplexEventChunk<StreamEvent> retrievedData) {
@@ -86,15 +77,6 @@ public ComplexEventChunk<StreamEvent> aggregateData(ComplexEventChunk<StreamEven
             groupByKeys.add(groupByKey);
             SiddhiAppContext.startGroupByFlow(groupByKey);
             ValueState state = (ValueState) valueStateHolder.getState();
-
-//            try {
-//            BaseIncrementalValueStore baseIncrementalValueStore = baseIncrementalValueGroupByStore
-//                    .computeIfAbsent(
-//                            groupByKey, k -> this.baseIncrementalValueStore.cloneStore(k, -1)
-//                    );
-//                process(streamEvent, baseIncrementalValueStore);
-//                process(streamEvent);
-
             try {
                 boolean shouldUpdate = true;
                 if (shouldUpdateTimestamp != null) {
@@ -115,9 +97,6 @@ public ComplexEventChunk<StreamEvent> aggregateData(ComplexEventChunk<StreamEven
                 valueStateHolder.returnState(state);
                 SiddhiAppContext.stopGroupByFlow();
             }
-//            } finally {
-//                SiddhiAppContext.stopGroupByFlow();
-//            }
         }
 
         //clean all executors
@@ -134,52 +113,6 @@ public ComplexEventChunk<StreamEvent> aggregateData(ComplexEventChunk<StreamEven
         return createEventChunkFromAggregatedData();
     }
 
-//    private void process(StreamEvent streamEvent, BaseIncrementalValueStore baseIncrementalValueStore) {
-//        List<ExpressionExecutor> expressionExecutors = baseIncrementalValueStore.getExpressionExecutors();
-//        boolean shouldUpdate = true;
-//        ExpressionExecutor shouldUpdateExpressionExecutor =
-//                baseIncrementalValueStore.getShouldUpdateExpressionExecutor();
-//        if (shouldUpdateExpressionExecutor != null) {
-//            shouldUpdate = ((boolean) shouldUpdateExpressionExecutor.execute(streamEvent));
-//        }
-//        baseIncrementalValueStore.setProcessed(true);
-//        for (int i = 0; i < expressionExecutors.size(); i++) { // keeping timestamp value location as null
-//            if (shouldUpdate) {
-//                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-//                baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-//            } else {
-//                ExpressionExecutor expressionExecutor = expressionExecutors.get(i);
-//                if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
-//                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-//                }
-//            }
-//        }
-//    }
-
-//    private void process(StreamEvent streamEvent) {
-//        IncrementalDataAggregator.ValueState state = (IncrementalDataAggregator.ValueState)
-// valueStateHolder.getState();
-//        try {
-//            boolean shouldUpdate = true;
-//            if (shouldUpdateTimestamp != null) {
-//                shouldUpdate = ((boolean) shouldUpdate(shouldUpdateTimestamp.execute(streamEvent), );
-//            }
-//            for (int i = 0; i < baseExecutors.size(); i++) { // keeping timestamp value location as null
-//                if (shouldUpdate) {
-//                    ExpressionExecutor expressionExecutor = baseExecutors.get(i);
-//                    baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-//                } else {
-//                    ExpressionExecutor expressionExecutor = baseExecutors.get(i);
-//                    if (!(expressionExecutor instanceof VariableExpressionExecutor)) {
-//                        baseIncrementalValueStore.setValue(expressionExecutor.execute(streamEvent), i + 1);
-//                    }
-//                }
-//            }
-//        } finally {
-//            valueStateHolder.returnState(state);
-//        }
-//    }
-
     private Object shouldUpdate(Object data, ValueState state) {
         long timestamp = (long) data;
         if (timestamp >= state.lastTimestamp) {
@@ -191,14 +124,6 @@ private Object shouldUpdate(Object data, ValueState state) {
 
 
     private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
-//        ComplexEventChunk<StreamEvent> processedInMemoryEventChunk = new ComplexEventChunk<>(true);
-//        return baseIncrementalValueStore.getProcessedEventChunk();
-//        for (Map.Entry<String, BaseIncrementalValueStore> entryAgainstTime :
-//                baseIncrementalValueGroupByStore.entrySet()) {
-//            processedInMemoryEventChunk.add(entryAgainstTime.getValue().createStreamEvent());
-//        }
-//        return processedInMemoryEventChunk;
-
         ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(true);
         Map<String, State> valueStoreMap = this.valueStateHolder.getAllGroupByStates();
         try {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
index 407adf90b7..1cd2966595 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/config/SiddhiAppContext.java
@@ -166,7 +166,7 @@ public void setScheduledExecutorService(ScheduledExecutorService scheduledExecut
         this.scheduledExecutorService = scheduledExecutorService;
     }
 
-    public synchronized void addEternalReferencedHolder(ExternalReferencedHolder externalReferencedHolder) {
+    public void addEternalReferencedHolder(ExternalReferencedHolder externalReferencedHolder) {
         externalReferencedHolders.add(externalReferencedHolder);
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventFactory.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventFactory.java
index 12ceff5bd1..61350da1be 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventFactory.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventFactory.java
@@ -31,6 +31,17 @@ public class StreamEventFactory implements EventFactory<StreamEvent>, Serializab
     private int onAfterWindowDataSize;
     private int outputDataSize;
 
+    /**
+     * Initialization of the factory using MetaStreamEvent
+     *
+     * @param metaStreamEvent meta stream event
+     */
+    public StreamEventFactory(MetaStreamEvent metaStreamEvent) {
+        this.beforeWindowDataSize = metaStreamEvent.getBeforeWindowData().size();
+        this.onAfterWindowDataSize = metaStreamEvent.getOnAfterWindowData().size();
+        this.outputDataSize = metaStreamEvent.getOutputData().size();
+    }
+
     /**
      * Initialization of the factory with event data sizes
      *
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/InConditionExpressionExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/InConditionExpressionExecutor.java
index b2e1069199..fddfa3dff4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/InConditionExpressionExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/executor/condition/InConditionExpressionExecutor.java
@@ -35,19 +35,18 @@ public class InConditionExpressionExecutor extends ConditionExpressionExecutor {
     private final int matchingStreamIndex;
     private final CompiledCondition compiledCondition;
     private Table table;
-    private FinderStateEvent finderStateEvent;
 
     public InConditionExpressionExecutor(Table table, CompiledCondition compiledCondition, int
             streamEventSize, boolean isMatchingEventAStateEvent, int matchingStreamIndex) {
         this.streamEventSize = streamEventSize;
         this.isMatchingEventAStateEvent = isMatchingEventAStateEvent;
         this.matchingStreamIndex = matchingStreamIndex;
-        this.finderStateEvent = new FinderStateEvent(streamEventSize, 0);
         this.table = table;
         this.compiledCondition = compiledCondition;
     }
 
-    public synchronized Boolean execute(ComplexEvent event) {
+    public Boolean execute(ComplexEvent event) {
+        FinderStateEvent finderStateEvent = new FinderStateEvent(streamEventSize, 0);
         try {
             if (isMatchingEventAStateEvent) {
                 finderStateEvent.setEvent((StateEvent) event);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
index ba674e654d..be466d26fe 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
@@ -73,19 +73,16 @@ public class PartitionRuntime {
     private final StateHolder<PartitionState> stateHolder;
     private String partitionName;
     private Partition partition;
-    private ConcurrentMap<String, StreamJunction> localStreamJunctionMap = new ConcurrentHashMap<String,
-            StreamJunction>();
-    private ConcurrentMap<String, StreamJunction> innerpartitionStreamReceiverStreamJunctionMap =
-            new ConcurrentHashMap<String, StreamJunction>();
-    //contains definition
-    private ConcurrentMap<String, AbstractDefinition> localStreamDefinitionMap = new ConcurrentHashMap<String,
-            AbstractDefinition>(); //contains stream definition
+    private ConcurrentMap<String, StreamJunction> localStreamJunctionMap = new ConcurrentHashMap<>();
+    private ConcurrentMap<String, StreamJunction> innerPartitionStreamReceiverStreamJunctionMap =
+            new ConcurrentHashMap<>();    //contains definition
+    private ConcurrentMap<String, AbstractDefinition> localStreamDefinitionMap =
+            new ConcurrentHashMap<>(); //contains stream definition
     private ConcurrentMap<String, AbstractDefinition> streamDefinitionMap;
     private ConcurrentMap<String, AbstractDefinition> windowDefinitionMap;
     private ConcurrentMap<String, StreamJunction> streamJunctionMap;
     private List<QueryRuntime> queryRuntimeList = new ArrayList<QueryRuntime>();
-    private ConcurrentMap<String, PartitionStreamReceiver> partitionStreamReceivers = new ConcurrentHashMap<String,
-            PartitionStreamReceiver>();
+    private ConcurrentMap<String, PartitionStreamReceiver> partitionStreamReceivers = new ConcurrentHashMap<>();
     private SiddhiAppContext siddhiAppContext;
 
     public PartitionRuntime(ConcurrentMap<String, AbstractDefinition> streamDefinitionMap,
@@ -181,16 +178,8 @@ public void addQuery(QueryRuntime metaQueryRuntime) {
             for (int i = 0; i < metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().size(); i++) {
                 String streamId = metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get(i)
                         .getProcessStreamReceiver().getStreamId();
-                StreamDefinition streamDefinition = null;
                 if (streamId.startsWith("#")) {
-                    streamDefinition = (StreamDefinition) localStreamDefinitionMap.get(streamId);
-
-//                else {
-//                    streamDefinition = (StreamDefinition) streamDefinitionMap.get(streamId);
-//                    if (streamDefinition == null) {
-//                        streamDefinition = (StreamDefinition) windowDefinitionMap.get(streamId);
-//                    }
-//                }
+                    StreamDefinition streamDefinition = (StreamDefinition) localStreamDefinitionMap.get(streamId);
                     StreamJunction streamJunction = localStreamJunctionMap.get(streamId);
                     if (streamJunction == null) {
                         streamJunction = new StreamJunction(streamDefinition, siddhiAppContext
@@ -274,37 +263,6 @@ private void addPartitionReceiver(String streamId, boolean isInnerStream, MetaSt
             streamJunctionMap.get(partitionStreamReceiver.getStreamId()).subscribe(partitionStreamReceiver);
         }
 
-
-//
-//
-//        if (metaQueryRuntime.isFromLocalStream()) {
-//            for (int i = 0; i < metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().size(); i++) {
-//                String streamId = metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get(i)
-//                        .getProcessStreamReceiver().getStreamId();
-//                StreamDefinition streamDefinition = null;
-//                if (streamId.startsWith("#")) {
-//                    streamDefinition = (StreamDefinition) localStreamDefinitionMap.get(streamId);
-////                } else {
-////                    streamDefinition = (StreamDefinition) streamDefinitionMap.get(streamId);
-////                    if (streamDefinition == null) {
-////                        streamDefinition = (StreamDefinition) windowDefinitionMap.get(streamId);
-////                    }
-////                }
-//                    StreamJunction streamJunction = localStreamJunctionMap.get(streamId);
-//                    if (streamJunction == null) {
-//                        streamJunction = new StreamJunction(streamDefinition, siddhiAppContext
-//                                .getExecutorService(),
-//                                siddhiAppContext.getBufferSize(),
-//                                null, siddhiAppContext);
-//                        localStreamJunctionMap.put(streamId, streamJunction);
-//                    }
-//                    streamJunction.subscribe(metaQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get
-//                            (i).getProcessStreamReceiver());
-//                }
-//            }
-//        }
-//
-//        partitionStreamReceiver.addStreamJunction(queryRuntimeList);
     }
 
     private StreamJunction createStreamJunction(StreamDefinition streamDefinition) {
@@ -312,76 +270,12 @@ private StreamJunction createStreamJunction(StreamDefinition streamDefinition) {
                 siddhiAppContext.getBufferSize(), null, siddhiAppContext);
     }
 
-//    /**
-//     * clone all the queries of the partition for a given partition key if they are not available
-//     *
-//     * @param key partition key
-//     */
-//    public void cloneIfNotExist(String key) {
-//        if (!partitionInstanceRuntimeMap.containsKey(key)) {
-//            clonePartition(key);
-//        }
-//    }
-
-    //    private synchronized void clonePartition() {
-//        List<QueryRuntime> partitionedQueryRuntimeList = new ArrayList<QueryRuntime>();
-//
-//        for (QueryRuntime queryRuntime : metaQueryRuntimeMap.values()) {
-//
-////            QueryRuntime clonedQueryRuntime = queryRuntime.clone(key, localStreamJunctionMap);
-//            queryRuntimeList.add(queryRuntime);
-//
-//            QueryParserHelper.registerMemoryUsageTracking(clonedQueryRuntime.getQueryId(), queryRuntime,
-//                    SiddhiConstants.METRIC_INFIX_QUERIES, siddhiAppContext, memoryUsageTracker);
-//
-//            if (queryRuntime.isFromLocalStream()) {
-//                for (int i = 0; i < clonedQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().size(); i++) {
-//                    String streamId = queryRuntime.getStreamRuntime().getSingleStreamRuntimes().get(i)
-//                            .getProcessStreamReceiver().getStreamId();
-//                    StreamDefinition streamDefinition = null;
-//                    if (streamId.startsWith("#")) {
-//                        streamDefinition = (StreamDefinition) localStreamDefinitionMap.get(streamId);
-//                    } else {
-//                        streamDefinition = (StreamDefinition) streamDefinitionMap.get(streamId);
-//                        if (streamDefinition == null) {
-//                            streamDefinition = (StreamDefinition) windowDefinitionMap.get(streamId);
-//                        }
-//                    }
-//                    StreamJunction streamJunction = localStreamJunctionMap.get(streamId + key);
-//                    if (streamJunction == null) {
-//                        streamJunction = new StreamJunction(streamDefinition, siddhiAppContext
-//                                .getExecutorService(),
-//                                siddhiAppContext.getBufferSize(),
-//                                null, siddhiAppContext);
-//                        localStreamJunctionMap.put(streamId + key, streamJunction);
-//                    }
-//                    streamJunction.subscribe(clonedQueryRuntime.getStreamRuntime().getSingleStreamRuntimes().get
-//                            (i).getProcessStreamReceiver());
-//                }
-//            } else {
-//                partitionedQueryRuntimeList.add(clonedQueryRuntime);
-//            }
-//        }
-//        partitionInstanceRuntimeMap.putIfAbsent(key, new PartitionInstanceRuntime(key, queryRuntimeList));
-//        updatePartitionStreamReceivers(key, partitionedQueryRuntimeList);
-//    }
-//
-//    private void updatePartitionStreamReceivers(String key, List<QueryRuntime> partitionedQueryRuntimeList) {
-//        for (PartitionStreamReceiver partitionStreamReceiver : partitionStreamReceivers.values()) {
-//            partitionStreamReceiver.addStreamJunction(key, partitionedQueryRuntimeList);
-//        }
-//    }
-//
-//    public void addLocalStreamJunction(String key, StreamJunction streamJunction) {
-//        localStreamJunctionMap.put(key, streamJunction);
-//    }
-//
     public void addInnerpartitionStreamReceiverStreamJunction(String key, StreamJunction streamJunction) {
-        innerpartitionStreamReceiverStreamJunctionMap.put(key, streamJunction);
+        innerPartitionStreamReceiverStreamJunctionMap.put(key, streamJunction);
     }
 
-    public ConcurrentMap<String, StreamJunction> getInnerpartitionStreamReceiverStreamJunctionMap() {
-        return innerpartitionStreamReceiverStreamJunctionMap;
+    public ConcurrentMap<String, StreamJunction> getInnerPartitionStreamReceiverStreamJunctionMap() {
+        return innerPartitionStreamReceiverStreamJunctionMap;
     }
 
     public void init() {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
index 55bc6cda6e..0ec1374be8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
@@ -23,7 +23,7 @@
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.event.stream.converter.StreamEventConverterFactory;
 import io.siddhi.core.partition.executor.PartitionExecutor;
@@ -42,7 +42,7 @@
  */
 public class PartitionStreamReceiver implements StreamJunction.Receiver {
 
-    private final StreamEventPool eventPool;
+    private final StreamEventFactory streamEventFactory;
     private StreamEventConverter streamEventConverter;
     private String streamId;
     private MetaStreamEvent metaStreamEvent;
@@ -63,7 +63,7 @@ public PartitionStreamReceiver(SiddhiAppContext siddhiAppContext, MetaStreamEven
         this.partitionExecutors = partitionExecutors;
         this.siddhiAppContext = siddhiAppContext;
         this.streamId = streamDefinition.getId();
-        this.eventPool = new StreamEventPool(metaStreamEvent, 5);
+        this.streamEventFactory = new StreamEventFactory(metaStreamEvent);
 
     }
 
@@ -84,7 +84,8 @@ public void receive(ComplexEvent complexEvent) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
             ComplexEvent aComplexEvent = complexEvent;
             while (aComplexEvent != null) {
-                StreamEvent borrowedEvent = borrowEvent();
+                StreamEvent borrowedEvent = streamEventFactory.newInstance();
+                ;
                 streamEventConverter.convertComplexEvent(aComplexEvent, borrowedEvent);
                 outputEventChunk.add(borrowedEvent);
                 aComplexEvent = aComplexEvent.getNext();
@@ -93,7 +94,8 @@ public void receive(ComplexEvent complexEvent) {
         } else {
             if (complexEvent.getNext() == null) {
                 for (PartitionExecutor partitionExecutor : partitionExecutors) {
-                    StreamEvent borrowedEvent = borrowEvent();
+                    StreamEvent borrowedEvent = streamEventFactory.newInstance();
+                    ;
                     streamEventConverter.convertComplexEvent(complexEvent, borrowedEvent);
                     String key = partitionExecutor.execute(borrowedEvent);
                     send(key, borrowedEvent);
@@ -106,7 +108,8 @@ public void receive(ComplexEvent complexEvent) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent aEvent = complexEventChunk.next();
                     complexEventChunk.remove();
-                    StreamEvent borrowedEvent = borrowEvent();
+                    StreamEvent borrowedEvent = streamEventFactory.newInstance();
+                    ;
                     streamEventConverter.convertComplexEvent(aEvent, borrowedEvent);
                     boolean currentEventMatchedPrevPartitionExecutor = false;
                     for (PartitionExecutor partitionExecutor : partitionExecutors) {
@@ -125,7 +128,8 @@ public void receive(ComplexEvent complexEvent) {
                                     send(currentKey, firstEvent);
                                     currentKey = key;
                                     outputEventChunk.clear();
-                                    StreamEvent cloneEvent = borrowEvent();
+                                    StreamEvent cloneEvent = streamEventFactory.newInstance();
+                                    ;
                                     streamEventConverter.convertComplexEvent(aEvent, cloneEvent);
                                     outputEventChunk.add(cloneEvent);
                                 }
@@ -146,7 +150,8 @@ public void receive(ComplexEvent complexEvent) {
 
     @Override
     public void receive(Event event) {
-        StreamEvent borrowedEvent = borrowEvent();
+        StreamEvent borrowedEvent = streamEventFactory.newInstance();
+        ;
         streamEventConverter.convertEvent(event, borrowedEvent);
         for (PartitionExecutor partitionExecutor : partitionExecutors) {
             String key = partitionExecutor.execute(borrowedEvent);
@@ -155,12 +160,12 @@ public void receive(Event event) {
         if (partitionExecutors.size() == 0) {
             send(borrowedEvent);
         }
-        returnEvents(borrowedEvent);
     }
 
     @Override
     public void receive(long timestamp, Object[] data) {
-        StreamEvent borrowedEvent = borrowEvent();
+        StreamEvent borrowedEvent = streamEventFactory.newInstance();
+        ;
         streamEventConverter.convertData(timestamp, data, borrowedEvent);
         if (partitionExecutors.size() == 0) {
             send(borrowedEvent);
@@ -170,31 +175,31 @@ public void receive(long timestamp, Object[] data) {
                 send(key, borrowedEvent);
             }
         }
-        returnEvents(borrowedEvent);
     }
 
     @Override
     public void receive(Event[] events) {
         if (partitionExecutors.size() == 0) {
             StreamEvent currentEvent;
-            StreamEvent firstEvent = borrowEvent();
+            StreamEvent firstEvent = streamEventFactory.newInstance();
+            ;
             streamEventConverter.convertEvent(events[0], firstEvent);
             currentEvent = firstEvent;
             for (int i = 1; i < events.length; i++) {
-                StreamEvent nextEvent = borrowEvent();
+                StreamEvent nextEvent = streamEventFactory.newInstance();
+                ;
                 streamEventConverter.convertEvent(events[i], nextEvent);
                 currentEvent.setNext(nextEvent);
                 currentEvent = nextEvent;
             }
             send(firstEvent);
-            returnEvents(firstEvent);
-
         } else {
             String key = null;
             StreamEvent firstEvent = null;
             StreamEvent currentEvent = null;
             for (Event event : events) {
-                StreamEvent nextEvent = borrowEvent();
+                StreamEvent nextEvent = streamEventFactory.newInstance();
+                ;
                 streamEventConverter.convertEvent(event, nextEvent);
                 for (PartitionExecutor partitionExecutor : partitionExecutors) {
                     String currentKey = partitionExecutor.execute(nextEvent);
@@ -204,7 +209,6 @@ public void receive(Event[] events) {
                             firstEvent = nextEvent;
                         } else if (!currentKey.equals(key)) {
                             send(key, firstEvent);
-                            returnEvents(firstEvent);
                             key = currentKey;
                             firstEvent = nextEvent;
                         } else {
@@ -215,7 +219,6 @@ public void receive(Event[] events) {
                 }
             }
             send(key, firstEvent);
-            returnEvents(firstEvent);
         }
 
     }
@@ -226,7 +229,8 @@ public void receive(List<Event> events) {
             StreamEvent firstEvent = null;
             StreamEvent currentEvent = null;
             for (Event event : events) {
-                StreamEvent nextEvent = borrowEvent();
+                StreamEvent nextEvent = streamEventFactory.newInstance();
+                ;
                 streamEventConverter.convertEvent(event, nextEvent);
                 if (firstEvent == null) {
                     firstEvent = nextEvent;
@@ -236,13 +240,13 @@ public void receive(List<Event> events) {
                 currentEvent = nextEvent;
             }
             send(firstEvent);
-            returnEvents(firstEvent);
         } else {
             String key = null;
             StreamEvent firstEvent = null;
             StreamEvent currentEvent = null;
             for (Event event : events) {
-                StreamEvent nextEvent = borrowEvent();
+                StreamEvent nextEvent = streamEventFactory.newInstance();
+                ;
                 streamEventConverter.convertEvent(event, nextEvent);
                 for (PartitionExecutor partitionExecutor : partitionExecutors) {
                     String currentKey = partitionExecutor.execute(nextEvent);
@@ -252,7 +256,6 @@ public void receive(List<Event> events) {
                             firstEvent = nextEvent;
                         } else if (!currentKey.equals(key)) {
                             send(key, firstEvent);
-                            returnEvents(firstEvent);
                             key = currentKey;
                             firstEvent = nextEvent;
                         } else {
@@ -263,7 +266,6 @@ public void receive(List<Event> events) {
                 }
             }
             send(key, firstEvent);
-            returnEvents(firstEvent);
         }
     }
 
@@ -299,17 +301,13 @@ private void send(ComplexEvent event) {
     public void addStreamJunction(List<QueryRuntime> queryRuntimeList) {
         StreamJunction streamJunction = streamJunctionMap.get(streamId);
         if (streamJunction == null) {
-            streamJunction = partitionRuntime.getInnerpartitionStreamReceiverStreamJunctionMap().get(streamId);
+            streamJunction = partitionRuntime.getInnerPartitionStreamReceiverStreamJunctionMap().get(streamId);
             if (streamJunction == null) {
                 streamJunction = createStreamJunction();
                 partitionRuntime.addInnerpartitionStreamReceiverStreamJunction(streamId, streamJunction);
             }
-            streamJunctionMap.put(streamId , streamJunction);
+            streamJunctionMap.put(streamId, streamJunction);
         }
-//        if (streamJunction == null) {
-//            streamJunction = createStreamJunction();
-//            this.streamJunctionMap.put(streamId, streamJunction);
-//        }
         for (QueryRuntime queryRuntime : queryRuntimeList) {
             StreamRuntime streamRuntime = queryRuntime.getStreamRuntime();
             for (int i = 0; i < queryRuntime.getInputStreamId().size(); i++) {
@@ -327,11 +325,4 @@ private StreamJunction createStreamJunction() {
                 siddhiAppContext.getBufferSize(), null, siddhiAppContext);
     }
 
-    private synchronized StreamEvent borrowEvent() {
-        return eventPool.borrowEvent();
-    }
-
-    private synchronized void returnEvents(StreamEvent events) {
-        eventPool.returnEvents(events);
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
index b95f61032f..1d031d06f3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
@@ -41,8 +41,8 @@ public class MultiProcessStreamReceiver extends ProcessStreamReceiver {
 
     private static ThreadLocal<ReturnEventHolder> multiProcessReturn = new ThreadLocal<>();
     protected Processor[] nextProcessors;
-    protected int processCount;
     protected int[] eventSequence;
+    private final Object patternSyncObject;
     protected OutputRateLimiter outputRateLimiter;
     private MetaStreamEvent[] metaStreamEvents;
     private StreamEventPool[] streamEventPools;
@@ -50,14 +50,14 @@ public class MultiProcessStreamReceiver extends ProcessStreamReceiver {
 
 
     public MultiProcessStreamReceiver(String streamId, int processCount,
-                                      SiddhiQueryContext siddhiQueryContext) {
+                                      Object patternSyncObject, SiddhiQueryContext siddhiQueryContext) {
         super(streamId, siddhiQueryContext);
-        this.processCount = processCount;
         nextProcessors = new Processor[processCount];
         metaStreamEvents = new MetaStreamEvent[processCount];
         streamEventPools = new StreamEventPool[processCount];
         streamEventConverters = new StreamEventConverter[processCount];
         eventSequence = new int[processCount];
+        this.patternSyncObject = patternSyncObject;
         for (int i = 0; i < eventSequence.length; i++) {
             eventSequence[i] = i;
         }
@@ -67,11 +67,6 @@ public static ThreadLocal<ReturnEventHolder> getMultiProcessReturn() {
         return multiProcessReturn;
     }
 
-    public MultiProcessStreamReceiver clone(String key) {
-        return new MultiProcessStreamReceiver(streamId + key, processCount,
-                siddhiQueryContext);
-    }
-
     private void process(int eventSequence, StreamEvent borrowedEvent) {
         if (lockWrapper != null) {
             lockWrapper.lock();
@@ -98,9 +93,11 @@ private void process(int eventSequence, StreamEvent borrowedEvent) {
     @Override
     public void receive(ComplexEvent complexEvent) {
         ComplexEvent aComplexEvent = complexEvent;
-        while (aComplexEvent != null) {
-            if (outputRateLimiter == null) {
-                synchronized (this) {
+        List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
+        synchronized (patternSyncObject) {
+            while (aComplexEvent != null) {
+                try {
+                    multiProcessReturn.set(new ReturnEventHolder());
                     stabilizeStates();
                     for (int anEventSequence : eventSequence) {
                         StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -108,42 +105,31 @@ public void receive(ComplexEvent complexEvent) {
                         StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
                         aStreamEventConverter.convertComplexEvent(aComplexEvent, borrowedEvent);
                         process(anEventSequence, borrowedEvent);
-                    }
-                }
-            } else {
-                List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-                synchronized (this) {
-                    try {
-                        multiProcessReturn.set(new ReturnEventHolder());
-                        stabilizeStates();
-                        for (int anEventSequence : eventSequence) {
-                            StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                            StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                            StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                            aStreamEventConverter.convertComplexEvent(aComplexEvent, borrowedEvent);
-                            process(anEventSequence, borrowedEvent);
-                            if (multiProcessReturn.get() != null &&
-                                    multiProcessReturn.get().complexEventChunk != null) {
-                                returnEventHolderList.add(multiProcessReturn.get());
-                                multiProcessReturn.set(new ReturnEventHolder());
-                            }
+                        if (multiProcessReturn.get() != null &&
+                                multiProcessReturn.get().complexEventChunk != null) {
+                            returnEventHolderList.add(multiProcessReturn.get());
+                            multiProcessReturn.set(new ReturnEventHolder());
                         }
-                    } finally {
-                        multiProcessReturn.set(null);
                     }
+                } finally {
+                    multiProcessReturn.set(null);
                 }
-                for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
-                    outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
-                }
+                aComplexEvent = aComplexEvent.getNext();
+            }
+            for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
+                outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
             }
-            aComplexEvent = aComplexEvent.getNext();
         }
+
     }
 
     @Override
     public void receive(Event event) {
-        if (outputRateLimiter == null) {
-            synchronized (this) {
+        List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
+        synchronized (patternSyncObject) {
+            try {
+                multiProcessReturn.set(new ReturnEventHolder());
+
                 stabilizeStates();
                 for (int anEventSequence : eventSequence) {
                     StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -151,14 +137,28 @@ public void receive(Event event) {
                     StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
                     aStreamEventConverter.convertEvent(event, borrowedEvent);
                     process(anEventSequence, borrowedEvent);
+                    if (multiProcessReturn.get() != null &&
+                            multiProcessReturn.get().complexEventChunk != null) {
+                        returnEventHolderList.add(multiProcessReturn.get());
+                        multiProcessReturn.set(new ReturnEventHolder());
+                    }
                 }
+            } finally {
+                multiProcessReturn.set(null);
             }
-        } else {
-            List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-            synchronized (this) {
+        }
+        for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
+            outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
+        }
+    }
+
+    @Override
+    public void receive(Event[] events) {
+        List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
+        synchronized (patternSyncObject) {
+            for (Event event : events) {
                 try {
                     multiProcessReturn.set(new ReturnEventHolder());
-
                     stabilizeStates();
                     for (int anEventSequence : eventSequence) {
                         StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -176,60 +176,19 @@ public void receive(Event event) {
                     multiProcessReturn.set(null);
                 }
             }
-            for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
-                outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
-            }
         }
-    }
-
-    @Override
-    public void receive(Event[] events) {
-        for (Event event : events) {
-            if (outputRateLimiter == null) {
-                synchronized (this) {
-                    stabilizeStates();
-                    for (int anEventSequence : eventSequence) {
-                        StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                        StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                        StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                        aStreamEventConverter.convertEvent(event, borrowedEvent);
-                        process(anEventSequence, borrowedEvent);
-                    }
-                }
-            } else {
-                List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-                synchronized (this) {
-                    try {
-                        multiProcessReturn.set(new ReturnEventHolder());
-                        stabilizeStates();
-                        for (int anEventSequence : eventSequence) {
-                            StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                            StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                            StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                            aStreamEventConverter.convertEvent(event, borrowedEvent);
-                            process(anEventSequence, borrowedEvent);
-                            if (multiProcessReturn.get() != null &&
-                                    multiProcessReturn.get().complexEventChunk != null) {
-                                returnEventHolderList.add(multiProcessReturn.get());
-                                multiProcessReturn.set(new ReturnEventHolder());
-                            }
-                        }
-                    } finally {
-                        multiProcessReturn.set(null);
-                    }
-                }
-                for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
-                    outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
-                }
-            }
+        for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
+            outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
         }
     }
 
     @Override
     public void receive(List<Event> events) {
-        for (Event event : events) {
-            if (outputRateLimiter == null) {
-                synchronized (this) {
+        List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
+        synchronized (patternSyncObject) {
+            for (Event event : events) {
+                try {
+                    multiProcessReturn.set(new ReturnEventHolder());
                     stabilizeStates();
                     for (int anEventSequence : eventSequence) {
                         StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -237,42 +196,28 @@ public void receive(List<Event> events) {
                         StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
                         aStreamEventConverter.convertEvent(event, borrowedEvent);
                         process(anEventSequence, borrowedEvent);
-                    }
-                }
-            } else {
-                List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-                synchronized (this) {
-                    try {
-                        multiProcessReturn.set(new ReturnEventHolder());
-
-                        stabilizeStates();
-                        for (int anEventSequence : eventSequence) {
-                            StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                            StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                            StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                            aStreamEventConverter.convertEvent(event, borrowedEvent);
-                            process(anEventSequence, borrowedEvent);
-                            if (multiProcessReturn.get() != null &&
-                                    multiProcessReturn.get().complexEventChunk != null) {
-                                returnEventHolderList.add(multiProcessReturn.get());
-                                multiProcessReturn.set(new ReturnEventHolder());
-                            }
+                        if (multiProcessReturn.get() != null &&
+                                multiProcessReturn.get().complexEventChunk != null) {
+                            returnEventHolderList.add(multiProcessReturn.get());
+                            multiProcessReturn.set(new ReturnEventHolder());
                         }
-                    } finally {
-                        multiProcessReturn.set(null);
                     }
-                }
-                for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
-                    outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
+                } finally {
+                    multiProcessReturn.set(null);
                 }
             }
         }
+        for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
+            outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
+        }
     }
 
     @Override
     public void receive(long timestamp, Object[] data) {
-        if (outputRateLimiter == null) {
-            synchronized (this) {
+        List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
+        synchronized (patternSyncObject) {
+            try {
+                multiProcessReturn.set(new ReturnEventHolder());
                 stabilizeStates();
                 for (int anEventSequence : eventSequence) {
                     StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
@@ -280,33 +225,18 @@ public void receive(long timestamp, Object[] data) {
                     StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
                     aStreamEventConverter.convertData(timestamp, data, borrowedEvent);
                     process(anEventSequence, borrowedEvent);
-                }
-            }
-        } else {
-            List<ReturnEventHolder> returnEventHolderList = new ArrayList<>(eventSequence.length);
-            synchronized (this) {
-                try {
-                    multiProcessReturn.set(new ReturnEventHolder());
-                    stabilizeStates();
-                    for (int anEventSequence : eventSequence) {
-                        StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                        StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                        StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                        aStreamEventConverter.convertData(timestamp, data, borrowedEvent);
-                        process(anEventSequence, borrowedEvent);
-                        if (multiProcessReturn.get() != null &&
-                                multiProcessReturn.get().complexEventChunk != null) {
-                            returnEventHolderList.add(multiProcessReturn.get());
-                            multiProcessReturn.set(new ReturnEventHolder());
-                        }
+                    if (multiProcessReturn.get() != null &&
+                            multiProcessReturn.get().complexEventChunk != null) {
+                        returnEventHolderList.add(multiProcessReturn.get());
+                        multiProcessReturn.set(new ReturnEventHolder());
                     }
-                } finally {
-                    multiProcessReturn.set(null);
                 }
+            } finally {
+                multiProcessReturn.set(null);
             }
-            for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
-                outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
-            }
+        }
+        for (ReturnEventHolder returnEventHolder : returnEventHolderList) {
+            outputRateLimiter.sendToCallBacks(returnEventHolder.complexEventChunk);
         }
     }
 
@@ -357,7 +287,6 @@ public void setStreamEventPool(StreamEventPool streamEventPool) {
     }
 
     public void init() {
-
         for (int i = 0, nextLength = streamEventConverters.length; i < nextLength; i++) {
             StreamEventConverter streamEventConverter = streamEventConverters[i];
             if (streamEventConverter == null) {
@@ -376,7 +305,6 @@ public void setOutputRateLimiter(OutputRateLimiter outputRateLimiter) {
      */
     public class ReturnEventHolder {
         ComplexEventChunk complexEventChunk;
-
         public void setReturnEvents(ComplexEventChunk complexEventChunk) {
             if (this.complexEventChunk == null) {
                 this.complexEventChunk = new ComplexEventChunk(complexEventChunk.isBatch());
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/SingleProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/SingleProcessStreamReceiver.java
index a62e22bcc8..2dcc0f88b4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/SingleProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/SingleProcessStreamReceiver.java
@@ -31,12 +31,13 @@
  */
 public class SingleProcessStreamReceiver extends ProcessStreamReceiver {
 
-    protected final String lockKey;
+    private final Object patternSyncObject;
     private QuerySelector querySelector;
 
-    public SingleProcessStreamReceiver(String streamId, String lockKey, SiddhiQueryContext siddhiQueryContext) {
+    public SingleProcessStreamReceiver(String streamId, Object patternSyncObject,
+                                       SiddhiQueryContext siddhiQueryContext) {
         super(streamId, siddhiQueryContext);
-        this.lockKey = lockKey;
+        this.patternSyncObject = patternSyncObject;
     }
 
     public void setNext(Processor next) {
@@ -45,10 +46,10 @@ public void setNext(Processor next) {
     }
 
     protected void processAndClear(ComplexEventChunk<StreamEvent> streamEventChunk) {
-        ComplexEventChunk<StateEvent> retEventChunk = new ComplexEventChunk<StateEvent>(false);
-        ComplexEventChunk<StreamEvent> currentStreamEventChunk = new ComplexEventChunk<StreamEvent>(
+        ComplexEventChunk<StateEvent> retEventChunk = new ComplexEventChunk<>(false);
+        ComplexEventChunk<StreamEvent> currentStreamEventChunk = new ComplexEventChunk<>(
                 batchProcessingAllowed);
-        synchronized (lockKey) {
+        synchronized (patternSyncObject) {
             while (streamEventChunk.hasNext()) {
                 StreamEvent streamEvent = streamEventChunk.next();
                 streamEventChunk.remove();
@@ -67,7 +68,7 @@ protected void processAndClear(ComplexEventChunk<StreamEvent> streamEventChunk)
         while (retEventChunk.hasNext()) {
             StateEvent stateEvent = retEventChunk.next();
             retEventChunk.remove();
-            querySelector.process(new ComplexEventChunk<StateEvent>(stateEvent, stateEvent, false));
+            querySelector.process(new ComplexEventChunk<>(stateEvent, stateEvent, false));
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/StateMultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/StateMultiProcessStreamReceiver.java
index d2e1bbe6d0..e607d5987d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/StateMultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/StateMultiProcessStreamReceiver.java
@@ -33,8 +33,9 @@ public class StateMultiProcessStreamReceiver extends MultiProcessStreamReceiver
 
     private QuerySelector querySelector;
 
-    public StateMultiProcessStreamReceiver(String streamId, int processCount, SiddhiQueryContext siddhiQueryContext) {
-        super(streamId, processCount, siddhiQueryContext);
+    public StateMultiProcessStreamReceiver(String streamId, int processCount, Object patternSyncObject,
+                                           SiddhiQueryContext siddhiQueryContext) {
+        super(streamId, processCount, patternSyncObject, siddhiQueryContext);
     }
 
     public void setNext(Processor next) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
index 5c8a6d68c1..cbea237a7d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
@@ -282,11 +282,9 @@ public void start() {
             if (!state.isStarted()) {
                 state.started();
                 if (isStartState && waitingTime != -1 && state.active) {
-                    synchronized (this) {
-                        state.lastScheduledTime = this.siddhiQueryContext.getSiddhiAppContext()
-                                .getTimestampGenerator().currentTime() + waitingTime;
-                        this.scheduler.notifyAt(state.lastScheduledTime);
-                    }
+                    state.lastScheduledTime = this.siddhiQueryContext.getSiddhiAppContext()
+                            .getTimestampGenerator().currentTime() + waitingTime;
+                    this.scheduler.notifyAt(state.lastScheduledTime);
                 }
             }
         } finally {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternMultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternMultiProcessStreamReceiver.java
index 580fb13971..66beb889fe 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternMultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternMultiProcessStreamReceiver.java
@@ -19,13 +19,9 @@
 package io.siddhi.core.query.input.stream.state.receiver;
 
 import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.ComplexEvent;
-import io.siddhi.core.event.Event;
 import io.siddhi.core.query.input.StateMultiProcessStreamReceiver;
 import io.siddhi.core.query.input.stream.state.PreStateProcessor;
 
-import java.util.List;
-
 /**
  * {StreamJunction.Receiver} implementation to receive events into pattern queries
  * with multiple streams.
@@ -33,8 +29,8 @@
 public class PatternMultiProcessStreamReceiver extends StateMultiProcessStreamReceiver {
 
     public PatternMultiProcessStreamReceiver(String streamId, int processCount,
-                                             SiddhiQueryContext siddhiQueryContext) {
-        super(streamId, processCount, siddhiQueryContext);
+                                             Object patternSyncObject, SiddhiQueryContext siddhiQueryContext) {
+        super(streamId, processCount, patternSyncObject, siddhiQueryContext);
         eventSequence = new int[processCount];
         int count = 0;
         for (int i = eventSequence.length - 1; i >= 0; i--) {
@@ -50,29 +46,4 @@ protected void stabilizeStates() {
             }
         }
     }
-
-    @Override
-    public void receive(ComplexEvent complexEvent) {
-        super.receive(complexEvent);
-    }
-
-    @Override
-    public void receive(Event event) {
-        super.receive(event);
-    }
-
-    @Override
-    public void receive(Event[] events) {
-        super.receive(events);
-    }
-
-    @Override
-    public void receive(List<Event> events) {
-        super.receive(events);
-    }
-
-    @Override
-    public void receive(long timestamp, Object[] data) {
-        super.receive(timestamp, data);
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternSingleProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternSingleProcessStreamReceiver.java
index a5701adc51..c6bc223d1f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternSingleProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/PatternSingleProcessStreamReceiver.java
@@ -18,20 +18,17 @@
 package io.siddhi.core.query.input.stream.state.receiver;
 
 import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.ComplexEvent;
-import io.siddhi.core.event.Event;
 import io.siddhi.core.query.input.SingleProcessStreamReceiver;
 
-import java.util.List;
-
 /**
  * {StreamJunction.Receiver} implementation to receive events into pattern queries
  * with single stream.
  */
 public class PatternSingleProcessStreamReceiver extends SingleProcessStreamReceiver {
 
-    public PatternSingleProcessStreamReceiver(String streamId, String lockKey, SiddhiQueryContext siddhiQueryContext) {
-        super(streamId, lockKey, siddhiQueryContext);
+    public PatternSingleProcessStreamReceiver(String streamId, Object patternSyncObject,
+                                              SiddhiQueryContext siddhiQueryContext) {
+        super(streamId, patternSyncObject, siddhiQueryContext);
     }
 
     protected void stabilizeStates() {
@@ -39,29 +36,4 @@ protected void stabilizeStates() {
             stateProcessors.get(0).updateState();
         }
     }
-
-    @Override
-    public void receive(ComplexEvent complexEvent) {
-        super.receive(complexEvent);
-    }
-
-    @Override
-    public void receive(Event event) {
-        super.receive(event);
-    }
-
-    @Override
-    public void receive(Event[] events) {
-        super.receive(events);
-    }
-
-    @Override
-    public void receive(List<Event> events) {
-        super.receive(events);
-    }
-
-    @Override
-    public void receive(long timestamp, Object[] data) {
-        super.receive(timestamp, data);
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceMultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceMultiProcessStreamReceiver.java
index adfe0b0b4a..58ff205a7a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceMultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceMultiProcessStreamReceiver.java
@@ -19,13 +19,9 @@
 package io.siddhi.core.query.input.stream.state.receiver;
 
 import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.ComplexEvent;
-import io.siddhi.core.event.Event;
 import io.siddhi.core.query.input.StateMultiProcessStreamReceiver;
 import io.siddhi.core.query.input.stream.state.StateStreamRuntime;
 
-import java.util.List;
-
 /**
  * {StreamJunction.Receiver} implementation to receive events into sequence queries
  * with multiple streams.
@@ -35,8 +31,8 @@ public class SequenceMultiProcessStreamReceiver extends StateMultiProcessStreamR
     private StateStreamRuntime stateStreamRuntime;
 
     public SequenceMultiProcessStreamReceiver(String streamId, int processCount, StateStreamRuntime
-            stateStreamRuntime, SiddhiQueryContext siddhiQueryContext) {
-        super(streamId, processCount, siddhiQueryContext);
+            stateStreamRuntime, Object patternSyncObject, SiddhiQueryContext siddhiQueryContext) {
+        super(streamId, processCount, patternSyncObject, siddhiQueryContext);
         this.stateStreamRuntime = stateStreamRuntime;
         eventSequence = new int[processCount];
         int count = 0;
@@ -50,28 +46,4 @@ protected void stabilizeStates() {
         stateStreamRuntime.resetAndUpdate();
     }
 
-    @Override
-    public void receive(ComplexEvent complexEvent) {
-        super.receive(complexEvent);
-    }
-
-    @Override
-    public void receive(Event event) {
-        super.receive(event);
-    }
-
-    @Override
-    public void receive(Event[] events) {
-        super.receive(events);
-    }
-
-    @Override
-    public void receive(List<Event> events) {
-        super.receive(events);
-    }
-
-    @Override
-    public void receive(long timestamp, Object[] data) {
-        super.receive(timestamp, data);
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceSingleProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceSingleProcessStreamReceiver.java
index 9e5394bbdf..2205c317ae 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceSingleProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/receiver/SequenceSingleProcessStreamReceiver.java
@@ -19,13 +19,9 @@
 package io.siddhi.core.query.input.stream.state.receiver;
 
 import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.ComplexEvent;
-import io.siddhi.core.event.Event;
 import io.siddhi.core.query.input.SingleProcessStreamReceiver;
 import io.siddhi.core.query.input.stream.state.StateStreamRuntime;
 
-import java.util.List;
-
 /**
  * {StreamJunction.Receiver} implementation to receive events into sequence queries
  * with single stream.
@@ -35,8 +31,8 @@ public class SequenceSingleProcessStreamReceiver extends SingleProcessStreamRece
     private StateStreamRuntime stateStreamRuntime;
 
     public SequenceSingleProcessStreamReceiver(String streamId, StateStreamRuntime stateStreamRuntime,
-                                               String lockKey, SiddhiQueryContext siddhiQueryContext) {
-        super(streamId, lockKey, siddhiQueryContext);
+                                               Object patternSyncObject, SiddhiQueryContext siddhiQueryContext) {
+        super(streamId, patternSyncObject, siddhiQueryContext);
         this.stateStreamRuntime = stateStreamRuntime;
     }
 
@@ -44,28 +40,4 @@ protected void stabilizeStates() {
         stateStreamRuntime.resetAndUpdate();
     }
 
-    @Override
-    public void receive(ComplexEvent complexEvent) {
-        super.receive(complexEvent);
-    }
-
-    @Override
-    public void receive(Event event) {
-        super.receive(event);
-    }
-
-    @Override
-    public void receive(Event[] events) {
-        super.receive(events);
-    }
-
-    @Override
-    public void receive(List<Event> events) {
-        super.receive(events);
-    }
-
-    @Override
-    public void receive(long timestamp, Object[] data) {
-        super.receive(timestamp, data);
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/DeleteTableCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/DeleteTableCallback.java
index d5da6c2c0f..2073ad83e6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/DeleteTableCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/DeleteTableCallback.java
@@ -56,7 +56,7 @@ public DeleteTableCallback(Table table, CompiledCondition compiledCondition, int
     }
 
     @Override
-    public synchronized void send(ComplexEventChunk deletingEventChunk, int noOfEvents) {
+    public void send(ComplexEventChunk deletingEventChunk, int noOfEvents) {
         if (getSiddhiDebugger() != null) {
             getSiddhiDebugger()
                     .checkBreakPoint(getQueryName(), SiddhiDebugger.QueryTerminal.OUT, deletingEventChunk.getFirst());
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/OutputCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/OutputCallback.java
index 700f101565..b755f9bd41 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/OutputCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/OutputCallback.java
@@ -53,16 +53,11 @@ String getQueryName() {
         return queryName;
     }
 
-    protected ComplexEventChunk<StateEvent> constructMatchingStateEventChunk(ComplexEventChunk
-                                                                                     matchingComplexEventChunk,
-                                                                             boolean convertToStreamEvent,
-                                                                             StateEventPool stateEventPool,
-                                                                             int matchingStreamIndex, StreamEventPool
-                                                                                     streamEventPool,
-                                                                             StreamEventConverter
-                                                                                     streamEventConverter) {
-        ComplexEventChunk<StateEvent> stateEventChunk = new ComplexEventChunk<StateEvent>(matchingComplexEventChunk
-                .isBatch());
+    protected ComplexEventChunk<StateEvent> constructMatchingStateEventChunk(
+            ComplexEventChunk matchingComplexEventChunk, boolean convertToStreamEvent, StateEventPool stateEventPool,
+            int matchingStreamIndex, StreamEventPool streamEventPool, StreamEventConverter streamEventConverter) {
+        ComplexEventChunk<StateEvent> stateEventChunk = new ComplexEventChunk<StateEvent>(
+                matchingComplexEventChunk.isBatch());
         while (matchingComplexEventChunk.hasNext()) {
             ComplexEvent matchingComplexEvent = matchingComplexEventChunk.next();
             matchingComplexEventChunk.remove();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/QueryCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/QueryCallback.java
index a28b79406c..3409dfa47d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/QueryCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/QueryCallback.java
@@ -94,14 +94,6 @@ private void bufferEvent(ComplexEvent complexEvent, List<Event> eventBuffer) {
         eventBuffer.add(new Event(complexEvent.getOutputData().length).copyFrom(complexEvent));
     }
 
-    public synchronized void startProcessing() {
-
-    }
-
-    public synchronized void stopProcessing() {
-
-    }
-
     public abstract void receive(long timestamp, Event[] inEvents, Event[] removeEvents);
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateTableCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateTableCallback.java
index 594a56ec79..c9f08bbc20 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateTableCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateTableCallback.java
@@ -59,7 +59,7 @@ public UpdateTableCallback(Table table, CompiledCondition compiledCondition, Com
     }
 
     @Override
-    public synchronized void send(ComplexEventChunk updatingEventChunk, int noOfEvents) {
+    public void send(ComplexEventChunk updatingEventChunk, int noOfEvents) {
         if (getSiddhiDebugger() != null) {
             getSiddhiDebugger()
                     .checkBreakPoint(getQueryName(), SiddhiDebugger.QueryTerminal.OUT, updatingEventChunk.getFirst());
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
index 896a09396b..fd4b14f6ef 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
@@ -113,22 +113,18 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("Counter", counter);
-                state.put("GroupByKeys", groupByKeys);
-                state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
-            }
+            state.put("Counter", counter);
+            state.put("GroupByKeys", groupByKeys);
+            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
-            synchronized (this) {
-                counter = (int) state.get("Counter");
-                groupByKeys = (List<String>) state.get("GroupByKeys");
-                allComplexEventChunk.clear();
-                allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
-            }
+            counter = (int) state.get("Counter");
+            groupByKeys = (List<String>) state.get("GroupByKeys");
+            allComplexEventChunk.clear();
+            allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
index e6152dadcc..ee4db71723 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
@@ -109,10 +109,8 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("Counter", counter);
-                state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
-            }
+            state.put("Counter", counter);
+            state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index 3d65e99577..f8a0f23103 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -165,10 +165,8 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("EventList", eventList);
-                state.put("GroupByAggregateAttributeValueMap", groupByAggregateAttributeValueMap);
-            }
+            state.put("EventList", eventList);
+            state.put("GroupByAggregateAttributeValueMap", groupByAggregateAttributeValueMap);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
index 3010fc86a8..a45e53e228 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
@@ -100,36 +100,36 @@ public void process(ComplexEventChunk complexEventChunk) {
         AggregationRateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event, state);
-                } else {
-                    complexEventChunk.remove();
-                    tryFlushEvents(outputEventChunks, event, state);
-                    if (event.getType() == ComplexEvent.Type.CURRENT) {
-                        state.eventList.add(event);
-                        for (Integer position : aggregateAttributePositionList) {
-                            state.aggregateAttributeValueMap.put(position, event.getOutputData()[position]);
-                        }
-                    } else if (event.getType() == ComplexEvent.Type.EXPIRED) {
-                        for (Iterator<ComplexEvent> iterator = state.eventList.iterator(); iterator.hasNext(); ) {
-                            ComplexEvent complexEvent = iterator.next();
-                            if (comparator.compare(event, complexEvent) == 0) {
-                                iterator.remove();
-                                for (Integer position : aggregateAttributePositionList) {
-                                    state.aggregateAttributeValueMap.put(position, event.getOutputData()[position]);
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        tryFlushEvents(outputEventChunks, event, state);
+                    } else {
+                        complexEventChunk.remove();
+                        tryFlushEvents(outputEventChunks, event, state);
+                        if (event.getType() == ComplexEvent.Type.CURRENT) {
+                            state.eventList.add(event);
+                            for (Integer position : aggregateAttributePositionList) {
+                                state.aggregateAttributeValueMap.put(position, event.getOutputData()[position]);
+                            }
+                        } else if (event.getType() == ComplexEvent.Type.EXPIRED) {
+                            for (Iterator<ComplexEvent> iterator = state.eventList.iterator(); iterator.hasNext(); ) {
+                                ComplexEvent complexEvent = iterator.next();
+                                if (comparator.compare(event, complexEvent) == 0) {
+                                    iterator.remove();
+                                    for (Integer position : aggregateAttributePositionList) {
+                                        state.aggregateAttributeValueMap.put(position, event.getOutputData()[position]);
+                                    }
+                                    break;
                                 }
-                                break;
                             }
+                        } else if (event.getType() == ComplexEvent.Type.RESET) {
+                            state.eventList.clear();
+                            state.aggregateAttributeValueMap.clear();
                         }
-                    } else if (event.getType() == ComplexEvent.Type.RESET) {
-                        state.eventList.clear();
-                        state.aggregateAttributeValueMap.clear();
                     }
                 }
             }
-        }
         } finally {
             stateHolder.returnState(state);
         }
@@ -188,10 +188,8 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("EventList", eventList);
-                state.put("AggregateAttributeValueMap", aggregateAttributeValueMap);
-            }
+            state.put("EventList", eventList);
+            state.put("AggregateAttributeValueMap", aggregateAttributeValueMap);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index 3f1dca1a47..e76514a38a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -168,9 +168,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("GroupByKeyEvents", groupByKeyEvents);
-            }
+            state.put("GroupByKeyEvents", groupByKeyEvents);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
index ad6e5aca66..aad8d9c3d9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
@@ -123,9 +123,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("LastEvent", lastEvent);
-            }
+            state.put("LastEvent", lastEvent);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
index 80e323b1dd..88e02cf161 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
@@ -67,20 +67,20 @@ public void process(ComplexEventChunk complexEventChunk) {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
-            complexEventChunk.reset();
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.TIMER) {
-                    tryFlushEvents(outputEventChunks, event, state);
-                } else if (event.getType() == ComplexEvent.Type.CURRENT) {
-                    complexEventChunk.remove();
-                    tryFlushEvents(outputEventChunks, event, state);
-                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                    state.groupByKeyEvents.put(groupedComplexEvent.getGroupKey(),
-                            groupedComplexEvent.getComplexEvent());
+                complexEventChunk.reset();
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.TIMER) {
+                        tryFlushEvents(outputEventChunks, event, state);
+                    } else if (event.getType() == ComplexEvent.Type.CURRENT) {
+                        complexEventChunk.remove();
+                        tryFlushEvents(outputEventChunks, event, state);
+                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                        state.groupByKeyEvents.put(groupedComplexEvent.getGroupKey(),
+                                groupedComplexEvent.getComplexEvent());
+                    }
                 }
             }
-        }
         } finally {
             stateHolder.returnState(state);
         }
@@ -129,9 +129,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("GroupByKeyEvents", groupByKeyEvents);
-            }
+            state.put("GroupByKeyEvents", groupByKeyEvents);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
index a5881b53ad..99965f7fa1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
@@ -124,9 +124,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("EventChunk", eventChunk.getFirst());
-            }
+            state.put("EventChunk", eventChunk.getFirst());
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
index 6d674a2311..b07c57f2e2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
@@ -152,9 +152,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("EventList", eventList);
-            }
+            state.put("EventList", eventList);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
index 710130d323..91eda4f319 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
@@ -127,9 +127,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
-            }
+            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
index bd2796e847..21189ce957 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
@@ -134,10 +134,8 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
-                state.put("GroupByKeys", groupByKeys);
-            }
+            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+            state.put("GroupByKeys", groupByKeys);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
index 9853af6c41..c5d78bf93c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
@@ -124,9 +124,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("FirstEvent", firstEvent);
-            }
+            state.put("FirstEvent", firstEvent);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
index 4a47036777..1f014e81e1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
@@ -131,9 +131,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
-            }
+            state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
index 270411f261..2e703d2448 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
@@ -124,9 +124,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("LastEvent", lastEvent);
-            }
+            state.put("LastEvent", lastEvent);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchWindowProcessor.java
index a35c53f1a8..88d4b1ff1a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/BatchWindowProcessor.java
@@ -119,7 +119,7 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
                            StreamEventCloner streamEventCloner, WindowState state) {
         List<ComplexEventChunk<StreamEvent>> streamEventChunks = new ArrayList<ComplexEventChunk<StreamEvent>>();
         ComplexEventChunk<StreamEvent> currentEventChunk = new ComplexEventChunk<StreamEvent>(true);
-        synchronized (state) {
+         synchronized (state) {
             long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
             if (outputExpectsExpiredEvents) {
                 if (state.expiredEventQueue.getFirst() != null) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
index 369d41b5cf..5617148f95 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
@@ -511,16 +511,14 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("StartTime", startTime);
-                state.put("EndTime", endTime);
-                state.put("LastScheduledTime", lastScheduledTime);
-                state.put("LastCurrentEventTime", lastCurrentEventTime);
-                state.put("CurrentEventChunk", currentEventChunk.getFirst());
-                state.put("ExpiredEventChunk", expiredEventChunk != null ? expiredEventChunk.getFirst() : null);
-                state.put("ResetEvent", resetEvent);
-                state.put("Flushed", flushed);
-            }
+            state.put("StartTime", startTime);
+            state.put("EndTime", endTime);
+            state.put("LastScheduledTime", lastScheduledTime);
+            state.put("LastCurrentEventTime", lastCurrentEventTime);
+            state.put("CurrentEventChunk", currentEventChunk.getFirst());
+            state.put("ExpiredEventChunk", expiredEventChunk != null ? expiredEventChunk.getFirst() : null);
+            state.put("ResetEvent", resetEvent);
+            state.put("Flushed", flushed);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/FrequentWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/FrequentWindowProcessor.java
index c041a831c5..55f101ad32 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/FrequentWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/FrequentWindowProcessor.java
@@ -215,9 +215,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("CountMap", countMap);
-            }
+            state.put("CountMap", countMap);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthBatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthBatchWindowProcessor.java
index b07a990861..deb0e6b66c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthBatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthBatchWindowProcessor.java
@@ -322,12 +322,10 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("Count", count);
-                state.put("CurrentEventQueue", currentEventQueue != null ? currentEventQueue.getSnapshot() : null);
-                state.put("ExpiredEventQueue", expiredEventQueue != null ? expiredEventQueue.getSnapshot() : null);
-                state.put("ResetEvent", resetEvent);
-            }
+            state.put("Count", count);
+            state.put("CurrentEventQueue", currentEventQueue != null ? currentEventQueue.getSnapshot() : null);
+            state.put("ExpiredEventQueue", expiredEventQueue != null ? expiredEventQueue.getSnapshot() : null);
+            state.put("ResetEvent", resetEvent);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthWindowProcessor.java
index 5be3df0e4c..fa81a64576 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LengthWindowProcessor.java
@@ -95,7 +95,7 @@ protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, C
             throw new SiddhiAppValidationException("Length window should only have one parameter (<int> " +
                     "window.length), but found " + attributeExpressionExecutors.length + " input parameters.");
         }
-        return ()-> new WindowState();
+        return () -> new WindowState();
     }
 
     @Override
@@ -178,10 +178,8 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("Count", count);
-                state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
-            }
+            state.put("Count", count);
+            state.put("ExpiredEventQueue", expiredEventQueue.getSnapshot());
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LossyFrequentWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LossyFrequentWindowProcessor.java
index a0f2de21cc..c2ded7a4e4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LossyFrequentWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/LossyFrequentWindowProcessor.java
@@ -288,12 +288,10 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("CountMap", countMap);
-                state.put("Map", map);
-                state.put("TotalCount", totalCount);
-                state.put("CurrentBucketId", currentBucketId);
-            }
+            state.put("CountMap", countMap);
+            state.put("Map", map);
+            state.put("TotalCount", totalCount);
+            state.put("CurrentBucketId", currentBucketId);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SortWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SortWindowProcessor.java
index 68015bd26a..1b689d42e5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SortWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SortWindowProcessor.java
@@ -228,9 +228,7 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("SortedWindow", sortedWindow);
-            }
+            state.put("SortedWindow", sortedWindow);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
index 9cba64a1cc..2e2856baf9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
@@ -375,11 +375,9 @@ class WindowState extends State {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            synchronized (this) {
-                state.put("CurrentEventQueue", currentEventQueue != null ? currentEventQueue.getSnapshot() : null);
-                state.put("ExpiredEventQueue", expiredEventQueue != null ? expiredEventQueue.getSnapshot() : null);
-                state.put("ResetEvent", resetEvent);
-            }
+            state.put("CurrentEventQueue", currentEventQueue != null ? currentEventQueue.getSnapshot() : null);
+            state.put("ExpiredEventQueue", expiredEventQueue != null ? expiredEventQueue.getSnapshot() : null);
+            state.put("ResetEvent", resetEvent);
             return state;
         }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
index 917477ffbd..505b9a3aa8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/AttributeAggregatorExecutor.java
@@ -54,7 +54,7 @@ public void initAggregator(ExpressionExecutor[] attributeExpressionExecutors, Pr
         }
     }
 
-    public synchronized Object execute(ComplexEvent event) {
+    public Object execute(ComplexEvent event) {
         if (attributeSize > 1) {
             return processAttributeArray(event);
         } else if (attributeSize == 1) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/StreamJunction.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/StreamJunction.java
index 79452a5208..537b02c18f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/StreamJunction.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/StreamJunction.java
@@ -47,10 +47,8 @@
 import java.beans.ExceptionListener;
 import java.lang.reflect.Constructor;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 
 /**
@@ -66,8 +64,8 @@ public class StreamJunction implements EventBufferHolder {
     private int batchSize;
     private int workers = -1;
     private int bufferSize;
-    private List<Receiver> receivers = new CopyOnWriteArrayList<Receiver>();
-    private List<Publisher> publishers = Collections.synchronizedList(new LinkedList<>());
+    private List<Receiver> receivers = new LinkedList<>();
+    private List<Publisher> publishers = new LinkedList<>();
     private ExecutorService executorService;
     private boolean async = false;
     private Disruptor<EventExchangeHolder> disruptor;
@@ -75,7 +73,7 @@ public class StreamJunction implements EventBufferHolder {
     private ThroughputTracker throughputTracker = null;
     private boolean isTraceEnabled;
     private StreamJunction faultStreamJunction = null;
-    private FaultStreamEventConverter faultStreamEventChunk = null;
+    private FaultStreamEventConverter faultStreamEventConverter = null;
     private OnErrorAction onErrorAction = OnErrorAction.LOG;
     private ExceptionListener exceptionListener;
 
@@ -98,7 +96,7 @@ public StreamJunction(StreamDefinition streamDefinition, ExecutorService executo
             StreamEventPool faultStreamEventPool = new StreamEventPool(0, 0,
                     faultStreamDefinition.getAttributeList().size(), 5);
             faultStreamEventPool.borrowEvent();
-            faultStreamEventChunk = new FaultStreamEventConverter(faultStreamEventPool);
+            faultStreamEventConverter = new FaultStreamEventConverter(faultStreamEventPool);
 
         }
         try {
@@ -277,7 +275,7 @@ private void sendData(long timeStamp, Object[] data) {
     /**
      * Create and start disruptor based on annotations given in the streamDefinition.
      */
-    public synchronized void startProcessing() {
+    public void startProcessing() {
         if (!receivers.isEmpty() && async) {
             for (Constructor constructor : Disruptor.class.getConstructors()) {
                 if (constructor.getParameterTypes().length == 5) {      // If new disruptor classes available
@@ -315,7 +313,7 @@ public synchronized void startProcessing() {
         }
     }
 
-    public synchronized void stopProcessing() {
+    public void stopProcessing() {
         if (disruptor != null) {
             disruptor.shutdown();
         } else {
@@ -327,14 +325,14 @@ public synchronized void stopProcessing() {
         }
     }
 
-    public synchronized Publisher constructPublisher() {
+    public Publisher constructPublisher() {
         Publisher publisher = new Publisher();
         publisher.setStreamJunction(this);
         publishers.add(publisher);
         return publisher;
     }
 
-    public synchronized void subscribe(Receiver receiver) {
+    public void subscribe(Receiver receiver) {
         // To have reverse order at the sequence/pattern processors.
         if (!receivers.contains(receiver)) {
             receivers.add(receiver);
@@ -461,24 +459,16 @@ private void handleError(Object event, Exception e) {
                     if (faultStreamJunction != null) {
                         StreamEvent streamEvent = null;
                         if (event instanceof ComplexEvent) {
-                            synchronized (this) {
-                                streamEvent = faultStreamEventChunk.convert((ComplexEvent) event, e);
-                            }
+                            streamEvent = faultStreamEventConverter.convert((ComplexEvent) event, e);
                             faultStreamJunction.sendEvent(streamEvent);
                         } else if (event instanceof Event) {
-                            synchronized (this) {
-                                streamEvent = faultStreamEventChunk.convert((Event) event, e);
-                            }
+                            streamEvent = faultStreamEventConverter.convert((Event) event, e);
                             faultStreamJunction.sendEvent(streamEvent);
                         } else if (event instanceof Event[]) {
-                            synchronized (this) {
-                                streamEvent = faultStreamEventChunk.convert((Event[]) event, e);
-                            }
+                            streamEvent = faultStreamEventConverter.convert((Event[]) event, e);
                             faultStreamJunction.sendEvent(streamEvent);
                         } else if (event instanceof List) {
-                            synchronized (this) {
-                                streamEvent = faultStreamEventChunk.convert((List<Event>) event, e);
-                            }
+                            streamEvent = faultStreamEventConverter.convert((List<Event>) event, e);
                             faultStreamJunction.sendEvent(streamEvent);
                         }
                     } else {
@@ -505,10 +495,7 @@ private void handleError(long timeStamp, Object[] data, Exception e) {
                     break;
                 case STREAM:
                     if (faultStreamJunction != null) {
-                        StreamEvent streamEvent = null;
-                        synchronized (this) {
-                            streamEvent = faultStreamEventChunk.convert(timeStamp, data, e);
-                        }
+                        StreamEvent streamEvent = faultStreamEventConverter.convert(timeStamp, data, e);
                         faultStreamJunction.sendEvent(streamEvent);
                     } else {
                         log.error("Error in SiddhiApp '" + siddhiAppContext.getName() +
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
index 68641afd9c..d145439d88 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
@@ -88,19 +88,6 @@ public IncrementalAggregateCompileCondition(
         this.isProcessingOnExternalTime = isProcessingOnExternalTime;
     }
 
-//    @Override
-//    public CompiledCondition cloneCompilation(String key) {
-//        Map<TimePeriod.Duration, CompiledCondition> copyOfWithinTableCompiledConditions = new HashMap<>();
-//        for (Map.Entry<TimePeriod.Duration, CompiledCondition> entry : withinTableCompiledConditions.entrySet()) {
-//            copyOfWithinTableCompiledConditions.put(entry.getKey(), entry.getValue().cloneCompilation(key));
-//        }
-//        return new IncrementalAggregateCompileCondition(copyOfWithinTableCompiledConditions,
-//                inMemoryStoreCompileCondition.cloneCompilation(key),
-//                onCompiledCondition.cloneCompilation(key), tableMetaStreamEvent, aggregateMetaStreamEvent,
-//                additionalAttributes, alteredMatchingMetaInfoHolder, perExpressionExecutor,
-//                startTimeEndTimeExpressionExecutor, isProcessingOnExternalTime);
-//    }
-
     public StreamEvent find(StateEvent matchingEvent, AggregationDefinition aggregationDefinition,
                             Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMap,
                             Map<TimePeriod.Duration, Table> aggregationTables,
@@ -152,17 +139,12 @@ public StreamEvent find(StateEvent matchingEvent, AggregationDefinition aggregat
         long oldestInMemoryEventTimestamp = getOldestInMemoryEventTimestamp(incrementalExecutorMap,
                 incrementalDurations, perValue);
 
-//        ExpressionExecutor shouldUpdateExpressionExecutorClone =
-//                (shouldUpdateExpressionExecutor == null) ? null : shouldUpdateExpressionExecutor.cloneExecutor(null);
-//
         //If processing on external time, the in-memory data also needs to be queried
         if (isProcessingOnExternalTime || requiresAggregatingInMemoryData(oldestInMemoryEventTimestamp,
                 startTimeEndTime)) {
-//            List<ExpressionExecutor> clonedBaseExecutors = baseExecutorsForFind.stream().map(expressionExecutor ->
-//                    expressionExecutor.cloneExecutor("")).collect(Collectors.toList());
             IncrementalDataAggregator incrementalDataAggregator = new IncrementalDataAggregator(incrementalDurations,
                     perValue, oldestInMemoryEventTimestamp, baseExecutorsForFind, tableMetaStreamEvent,
-                    siddhiQueryContext, shouldUpdateTimestamp, groupbyKeyGeneratorList.get(0) != null);
+                    shouldUpdateTimestamp, groupbyKeyGeneratorList.get(0) != null);
             ComplexEventChunk<StreamEvent> aggregatedInMemoryEventChunk;
             // Aggregate in-memory data and create an event chunk out of it
             if (incrementalExecutorMapForPartitions != null) {
@@ -183,10 +165,6 @@ public StreamEvent find(StateEvent matchingEvent, AggregationDefinition aggregat
             int durationIndex = incrementalDurations.indexOf(perValue);
             List<ExpressionExecutor> expressionExecutors = aggregateProcessingExecutorsListForFind.get(durationIndex);
             GroupByKeyGenerator groupByKeyGenerator = groupbyKeyGeneratorList.get(durationIndex);
-
-//            ExpressionExecutor shouldUpdateExpressionExecutorCloneExt =
-//                    (shouldUpdateExpressionExecutor == null) ? null :
-//                            shouldUpdateExpressionExecutor.cloneExecutor(null);
             IncrementalExternalTimestampDataAggregator incrementalExternalTimestampDataAggregator =
                     new IncrementalExternalTimestampDataAggregator(expressionExecutors, groupByKeyGenerator,
                             tableMetaStreamEvent, siddhiQueryContext,
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
index 357c65d2a3..0227f71b9f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
@@ -228,17 +228,8 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
                             incrementalDuration))
                     .collect(Collectors.toList());
 
-//            ExpressionExecutor shouldUpdateExpressionExecutor = null;
             ExpressionExecutor shouldUpdateTimestamp = null;
             if (isLatestEventAdded) {
-//                Expression shouldUpdateExp = AttributeFunction.function(
-//                        "incrementalAggregator",
-//                        "shouldUpdate",
-//                        new Variable(AGG_LAST_TIMESTAMP_COL));
-//                shouldUpdateExpressionExecutor = ExpressionParser.parseExpression(shouldUpdateExp,
-//                        processedMetaStreamEvent, 0, tableMap, processVariableExpressionExecutors,
-//                        true, 0, ProcessingMode.BATCH, false,
-//                        siddhiQueryContext);
                 Expression shouldUpdateTimestampExp = new Variable(AGG_LAST_TIMESTAMP_COL);
                 shouldUpdateTimestamp = ExpressionParser.parseExpression(shouldUpdateTimestampExp,
                         processedMetaStreamEvent, 0, tableMap, processVariableExpressionExecutors,
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/JoinInputStreamParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/JoinInputStreamParser.java
index 97111a26b9..336ce7dbf6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/JoinInputStreamParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/JoinInputStreamParser.java
@@ -126,12 +126,12 @@ public static StreamRuntime parseInputStream(JoinInputStream joinInputStream,
                     leftMetaStreamEvent.setEventType(WINDOW);
                     rightMetaStreamEvent.setEventType(WINDOW);
                     rightProcessStreamReceiver = new MultiProcessStreamReceiver(
-                            joinInputStream.getAllStreamIds().get(0), 1, siddhiQueryContext);
+                            joinInputStream.getAllStreamIds().get(0), 1, new Object(), siddhiQueryContext);
                     rightProcessStreamReceiver.setBatchProcessingAllowed(true);
                     leftProcessStreamReceiver = rightProcessStreamReceiver;
                 } else if (streamDefinitionMap.containsKey(joinInputStream.getAllStreamIds().get(0))) {
                     rightProcessStreamReceiver = new MultiProcessStreamReceiver(
-                            joinInputStream.getAllStreamIds().get(0), 2, siddhiQueryContext);
+                            joinInputStream.getAllStreamIds().get(0), 2, new Object(), siddhiQueryContext);
                     leftProcessStreamReceiver = rightProcessStreamReceiver;
                 } else {
                     throw new SiddhiAppCreationException("Input of join is from static source " + leftInputStreamId +
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SelectorParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SelectorParser.java
index 031d498768..09e4076148 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SelectorParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SelectorParser.java
@@ -170,7 +170,13 @@ private static List<AttributeProcessor> getAttributeProcessors(Selector selector
                 List<Attribute> attributeList = ((MetaStreamEvent) metaComplexEvent).getLastInputDefinition()
                         .getAttributeList();
                 for (Attribute attribute : attributeList) {
-                    outputAttributes.add(new OutputAttribute(new Variable(attribute.getName())));
+                    Variable variable = new Variable(attribute.getName());
+                    variable.setQueryContextStartIndex(selector.getQueryContextStartIndex());
+                    variable.setQueryContextEndIndex(selector.getQueryContextEndIndex());
+                    OutputAttribute outputAttribute = new OutputAttribute(variable);
+                    outputAttribute.setQueryContextStartIndex(selector.getQueryContextStartIndex());
+                    outputAttribute.setQueryContextEndIndex(selector.getQueryContextEndIndex());
+                    outputAttributes.add(outputAttribute);
                 }
             } else {
                 int position = 0;
@@ -178,7 +184,12 @@ private static List<AttributeProcessor> getAttributeProcessors(Selector selector
                     if (metaPosition == SiddhiConstants.UNKNOWN_STATE || metaPosition == position) {
                         List<Attribute> attributeList = metaStreamEvent.getLastInputDefinition().getAttributeList();
                         for (Attribute attribute : attributeList) {
-                            OutputAttribute outputAttribute = new OutputAttribute(new Variable(attribute.getName()));
+                            Variable variable = new Variable(attribute.getName());
+                            variable.setQueryContextStartIndex(selector.getQueryContextStartIndex());
+                            variable.setQueryContextEndIndex(selector.getQueryContextEndIndex());
+                            OutputAttribute outputAttribute = new OutputAttribute(variable);
+                            outputAttribute.setQueryContextStartIndex(selector.getQueryContextStartIndex());
+                            outputAttribute.setQueryContextEndIndex(selector.getQueryContextEndIndex());
                             if (!outputAttributes.contains(outputAttribute)) {
                                 outputAttributes.add(outputAttribute);
                             } else {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StateInputStreamParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StateInputStreamParser.java
index 0088d6d0ab..2281830f6d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StateInputStreamParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StateInputStreamParser.java
@@ -87,25 +87,24 @@ public static StateStreamRuntime parseInputStream(StateInputStream stateInputStr
 
         StateStreamRuntime stateStreamRuntime = new StateStreamRuntime(siddhiQueryContext, metaStateEvent);
 
-        String defaultLockKey = "";
-
+        Object patternSyncObject = new Object();
         for (String streamId : stateInputStream.getAllStreamIds()) {
             int streamCount = stateInputStream.getStreamCount(streamId);
             if (streamCount == 1) {
                 if (stateInputStream.getStateType() == StateInputStream.Type.SEQUENCE) {
                     processStreamReceiverMap.put(streamId, new SequenceSingleProcessStreamReceiver(streamId,
-                            stateStreamRuntime, defaultLockKey, siddhiQueryContext));
+                            stateStreamRuntime, patternSyncObject, siddhiQueryContext));
                 } else {
                     processStreamReceiverMap.put(streamId, new PatternSingleProcessStreamReceiver(streamId,
-                            defaultLockKey, siddhiQueryContext));
+                            patternSyncObject, siddhiQueryContext));
                 }
             } else {
                 if (stateInputStream.getStateType() == StateInputStream.Type.SEQUENCE) {
                     processStreamReceiverMap.put(streamId, new SequenceMultiProcessStreamReceiver(streamId,
-                            streamCount, stateStreamRuntime, siddhiQueryContext));
+                            streamCount, stateStreamRuntime, patternSyncObject, siddhiQueryContext));
                 } else {
                     processStreamReceiverMap.put(streamId, new PatternMultiProcessStreamReceiver(streamId,
-                            streamCount, siddhiQueryContext));
+                            streamCount, patternSyncObject, siddhiQueryContext));
                 }
             }
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/QueryParserHelper.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/QueryParserHelper.java
index c053a6f4ab..a4f0fd1809 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/QueryParserHelper.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/QueryParserHelper.java
@@ -86,7 +86,7 @@ public static void reduceMetaComplexEvent(MetaComplexEvent metaComplexEvent) {
      *
      * @param metaStreamEvent MetaStreamEvent
      */
-    private static synchronized void reduceStreamAttributes(MetaStreamEvent metaStreamEvent) {
+    private static void reduceStreamAttributes(MetaStreamEvent metaStreamEvent) {
         for (Attribute attribute : metaStreamEvent.getOutputData()) {
             if (metaStreamEvent.getBeforeWindowData().contains(attribute)) {
                 metaStreamEvent.getBeforeWindowData().remove(attribute);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
index 3af4700005..0566e0a63a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
@@ -58,7 +58,7 @@ public class SnapshotService {
     public SnapshotService(SiddhiAppContext siddhiAppContext) {
         this.siddhiAppContext = siddhiAppContext;
         this.threadBarrier = siddhiAppContext.getThreadBarrier();
-        this.partitionIdStates = new ConcurrentHashMap<String, PartitionIdStateHolder>();
+        this.partitionIdStates = new ConcurrentHashMap<>();
     }
 
     public static ThreadLocal<Boolean> getSkipStateStorageThreadLocal() {
@@ -69,8 +69,7 @@ public ConcurrentHashMap<String, PartitionIdStateHolder> getStates() {
         return partitionIdStates;
     }
 
-    public synchronized Map<String, StateHolder> getStateHolderMap(String partitionId,
-                                                                   String queryName) {
+    public Map<String, StateHolder> getStateHolderMap(String partitionId, String queryName) {
         Boolean skipSnapshotable = skipStateStorageThreadLocal.get();
         if (skipSnapshotable == null || !skipSnapshotable) {
             PartitionIdStateHolder partitionIdStateHolder = this.partitionIdStates.get(partitionId);
@@ -88,19 +87,6 @@ public synchronized Map<String, StateHolder> getStateHolderMap(String partitionI
         return null;
     }
 
-    public synchronized void removeStateHolderMap(String partitionId, String queryName) {
-        Boolean skipSnapshotable = skipStateStorageThreadLocal.get();
-        if (skipSnapshotable == null || !skipSnapshotable) {
-            PartitionIdStateHolder partitionIdStateHolder = this.partitionIdStates.get(partitionId);
-            if (partitionIdStateHolder != null) {
-                partitionIdStateHolder.queryStateHolderMap.remove(queryName);
-                if (partitionIdStateHolder.queryStateHolderMap.isEmpty()) {
-                    this.partitionIdStates.remove(partitionId);
-                }
-            }
-        }
-    }
-
     public byte[] fullSnapshot() {
         try {
             SnapshotRequest.requestForFullSnapshot(true);
@@ -221,8 +207,6 @@ public IncrementalSnapshot incrementalSnapshot() {
                                         partitionKeyStates.entrySet()) {
                                     for (Map.Entry<String, State> groupByKeyState :
                                             partitionKeyState.getValue().entrySet()) {
-//                                        String partitionAndGroupByKey = partitionKeyState.getKey() + "--" +
-//                                                groupByKeyState.getKey();
                                         State state = groupByKeyState.getValue();
                                         Map<String, Object> itemStates = state.snapshot();
                                         if (itemStates != null) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/timestamp/TimestampGeneratorImpl.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/timestamp/TimestampGeneratorImpl.java
index f34229a116..390cf5abee 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/timestamp/TimestampGeneratorImpl.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/timestamp/TimestampGeneratorImpl.java
@@ -65,8 +65,7 @@ public class TimestampGeneratorImpl implements TimestampGenerator {
     /**
      * List of listeners listening to this timestamp generator.
      */
-    private List<TimestampGeneratorImpl.TimeChangeListener> timeChangeListeners =
-            new ArrayList<TimestampGeneratorImpl.TimeChangeListener>();
+    private List<TimestampGeneratorImpl.TimeChangeListener> timeChangeListeners = new ArrayList<>();
 
     private SiddhiAppContext siddhiAppContext;
 
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/FilterTestCase1.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/FilterTestCase1.java
index c8ba7e189f..810afee54f 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/FilterTestCase1.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/FilterTestCase1.java
@@ -102,7 +102,6 @@ public void receive(long timeStamp, Event[] inEvents, Event[] removeEvents) {
 
         };
         siddhiAppRuntime.addCallback("query2", queryCallback);
-        queryCallback.startProcessing();
 
         InputHandler inputHandler = siddhiAppRuntime.getInputHandler("cseEventStream");
 
@@ -112,7 +111,6 @@ public void receive(long timeStamp, Event[] inEvents, Event[] removeEvents) {
         inputHandler.send(new Object[]{"WSO2", 60.5f, 200L});
         SiddhiTestHelper.waitForEvents(10, 1, count, 100);
         AssertJUnit.assertTrue(eventArrived.get());
-        queryCallback.stopProcessing();
 
         siddhiAppRuntime.shutdown();
     }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/PassThroughTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/PassThroughTestCase.java
index 93dbf398fa..a5190d50a5 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/PassThroughTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/PassThroughTestCase.java
@@ -232,7 +232,6 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
         };
         siddhiAppRuntime.addCallback("query2", queryCallback);
-        queryCallback.startProcessing();
 
         InputHandler inputHandler = siddhiAppRuntime.getInputHandler("cseEventStream");
 
@@ -243,7 +242,6 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
         SiddhiTestHelper.waitForEvents(10, eventArrived, 100);
         AssertJUnit.assertEquals(2, count);
         AssertJUnit.assertTrue(eventArrived.get());
-        queryCallback.stopProcessing();
 
         siddhiAppRuntime.shutdown();
     }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
index dab2325ee8..e5af4802bd 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
@@ -106,7 +106,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery1")
     public void testTimeOutputRateLimitQuery2() throws InterruptedException {
         log.info("TimeOutputRateLimit test2");
 
@@ -163,7 +163,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery2")
     public void testTimeOutputRateLimitQuery3() throws InterruptedException {
         log.info("TimeOutputRateLimit test3");
 
@@ -220,7 +220,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery3")
     public void testTimeOutputRateLimitQuery4() throws InterruptedException {
         log.info("TimeOutputRateLimit test4");
 
@@ -279,7 +279,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery4")
     public void testTimeOutputRateLimitQuery5() throws InterruptedException {
         log.info("TimeOutputRateLimit test5");
 
@@ -338,7 +338,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery5")
     public void testTimeOutputRateLimitQuery6() throws InterruptedException {
         log.info("TimeOutputRateLimit test6");
 
@@ -397,7 +397,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery6")
     public void testTimeOutputRateLimitQuery7() throws InterruptedException {
         log.info("TimeOutputRateLimit test7");
 
@@ -456,7 +456,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery7")
     public void testTimeOutputRateLimitQuery8() throws InterruptedException {
         log.info("TimeOutputRateLimit test8");
 
@@ -515,7 +515,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery8")
     public void testTimeOutputRateLimitQuery9() throws InterruptedException {
         log.info("TimeOutputRateLimit test9");
 
@@ -574,7 +574,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery9")
     public void testTimeOutputRateLimitQuery10() throws InterruptedException {
         log.info("TimeOutputRateLimit test10");
 
@@ -633,7 +633,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery10")
     public void testTimeOutputRateLimitQuery11() throws InterruptedException {
         log.info("TimeOutputRateLimit test11");
 
@@ -694,7 +694,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery11")
     public void testTimeOutputRateLimitQuery12() throws InterruptedException {
         log.info("TimeOutputRateLimit test12");
 
@@ -755,7 +755,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery12")
     public void testTimeOutputRateLimitQuery13() throws InterruptedException {
         log.info("TimeOutputRateLimit test13");
 
@@ -816,7 +816,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery13")
     public void testTimeOutputRateLimitQuery14() throws InterruptedException {
         log.info("TimeOutputRateLimit test14");
 
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
index 6046643336..a7d0aa34fe 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
@@ -183,9 +183,9 @@ public void testSessionWindow4() {
             siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(purchaseEventStream + query);
 
         } catch (SiddhiAppCreationException e) {
-            AssertJUnit.assertEquals("Session window's 2nd parameter, session key should be a dynamic parameter"
-                    + " attribute but found a constant attribute "
-                    + "ConstantExpressionExecutor", e.getCause().getMessage());
+            AssertJUnit.assertEquals("Session window's 2nd parameter, session key should be a " +
+                    "dynamic parameter attribute but found a constant attribute " +
+                    "io.siddhi.core.executor.ConstantExpressionExecutor", e.getCause().getMessage());
             throw e;
         } finally {
             if (siddhiAppRuntime != null) {
diff --git a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedFilterQueryPerformance.java b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedFilterQueryPerformance.java
index 1fa0114c0b..67bac93ad9 100644
--- a/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedFilterQueryPerformance.java
+++ b/modules/siddhi-samples/performance-samples/src/main/java/io/siddhi/performance/SimplePartitionedFilterQueryPerformance.java
@@ -68,7 +68,7 @@ public void receive(Event[] events) {
         InputHandler inputHandler = siddhiAppRuntime.getInputHandler("cseEventStream");
         siddhiAppRuntime.start();
 
-        for (int i = 0; i <= 100; i++) {
+        for (int i = 0; i <= 10; i++) {
             EventPublisher eventPublisher = new EventPublisher(inputHandler);
             eventPublisher.start();
         }
diff --git a/pom.xml b/pom.xml
index cf1068750b..ff95260295 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,7 +539,7 @@
                         <phase>validate</phase>
                         <configuration>
                             <configLocation>
-                                https://raw.githubusercontent.com/wso2/code-quality-tools/master/checkstyle/checkstyle.xml
+                                https://raw.githubusercontent.com/wso2/code-quality-tools/v1.2/checkstyle/checkstyle.xml
                             </configLocation>
                             <suppressionsLocation>
                                 ${mavan.checkstyle.suppression.file}

From f498eee2c693aac8f7efc6765ae95483a90bcd8e Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Wed, 27 Mar 2019 12:28:02 +0530
Subject: [PATCH 11/21] Make snapshot and restore synchronized.

---
 .../stream/single/EntryValveExecutor.java     |  8 ++-
 .../stream/single/EntryValveProcessor.java    |  8 ++-
 .../core/stream/input/InputEntryValve.java    | 32 +++++++++---
 .../java/io/siddhi/core/util/Scheduler.java   |  3 +-
 .../io/siddhi/core/util/ThreadBarrier.java    | 14 +++++-
 .../core/util/snapshot/SnapshotService.java   | 49 +++++++++++++++++++
 6 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveExecutor.java
index a3c2eae2e8..3bddf69311 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveExecutor.java
@@ -42,8 +42,12 @@ public EntryValveExecutor(SiddhiAppContext siddhiAppContext) {
      */
     @Override
     public void execute(ComplexEventChunk complexEventChunk) {
-        threadBarrier.pass();
-        next.execute(complexEventChunk);
+        threadBarrier.enter();
+        try {
+            next.execute(complexEventChunk);
+        } finally {
+            threadBarrier.exit();
+        }
     }
 
     /**
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveProcessor.java
index fdff448c1a..a84ba6deeb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/single/EntryValveProcessor.java
@@ -44,8 +44,12 @@ public EntryValveProcessor(SiddhiAppContext siddhiAppContext) {
      */
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
-        threadBarrier.pass();
-        next.process(complexEventChunk);
+        threadBarrier.enter();
+        try {
+            next.process(complexEventChunk);
+        } finally {
+            threadBarrier.exit();
+        }
     }
 
     /**
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/InputEntryValve.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/InputEntryValve.java
index dbea1ec9d5..884ee5df3f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/InputEntryValve.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/input/InputEntryValve.java
@@ -40,25 +40,41 @@ public InputEntryValve(SiddhiAppContext siddhiAppContext, InputProcessor inputPr
 
     @Override
     public void send(Event event, int streamIndex) {
-        barrier.pass();
-        inputProcessor.send(event, streamIndex);
+        barrier.enter();
+        try {
+            inputProcessor.send(event, streamIndex);
+        } finally {
+            barrier.exit();
+        }
     }
 
     @Override
     public void send(Event[] events, int streamIndex) {
-        barrier.pass();
-        inputProcessor.send(events, streamIndex);
+        barrier.enter();
+        try {
+            inputProcessor.send(events, streamIndex);
+        } finally {
+            barrier.exit();
+        }
     }
 
     @Override
     public void send(List<Event> events, int streamIndex) {
-        barrier.pass();
-        inputProcessor.send(events, streamIndex);
+        barrier.enter();
+        try {
+            inputProcessor.send(events, streamIndex);
+        } finally {
+            barrier.exit();
+        }
     }
 
     @Override
     public void send(long timestamp, Object[] data, int streamIndex) {
-        barrier.pass();
-        inputProcessor.send(timestamp, data, streamIndex);
+        barrier.enter();
+        try {
+            inputProcessor.send(timestamp, data, streamIndex);
+        } finally {
+            barrier.exit();
+        }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
index a36c9546b1..f22683e294 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
@@ -174,7 +174,7 @@ protected void sendTimerEvents(SchedulerState state) {
             if (lockWrapper != null) {
                 lockWrapper.lock();
             }
-            threadBarrier.pass();
+            threadBarrier.enter();
             try {
                 ComplexEventChunk<StreamEvent> streamEventChunk = new ComplexEventChunk<>(false);
                 streamEventChunk.add(timerEvent);
@@ -194,6 +194,7 @@ protected void sendTimerEvents(SchedulerState state) {
                 if (lockWrapper != null) {
                     lockWrapper.unlock();
                 }
+                threadBarrier.exit();
             }
 
             toNotifyTime = state.toNotifyQueue.peek();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/ThreadBarrier.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/ThreadBarrier.java
index a91b6556d0..5c9f078212 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/ThreadBarrier.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/ThreadBarrier.java
@@ -18,6 +18,7 @@
 
 package io.siddhi.core.util;
 
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -26,12 +27,23 @@
 public class ThreadBarrier {
 
     private ReentrantLock lock = new ReentrantLock();
+    private AtomicInteger counter = new AtomicInteger();
 
-    public void pass() {
+    public void enter() {
         if (lock.isLocked()) {
             lock.lock();
             lock.unlock();
         }
+        counter.incrementAndGet();
+    }
+
+
+    public void exit() {
+        counter.decrementAndGet();
+    }
+
+    public int getActiveThreads() {
+        return counter.get();
     }
 
     public void lock() {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
index 0566e0a63a..1d8a61895e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
@@ -97,6 +97,7 @@ public byte[] fullSnapshot() {
             }
             try {
                 threadBarrier.lock();
+                waitForSystemStabilization();
                 for (Map.Entry<String, PartitionIdStateHolder> partitionIdState : partitionIdStates.entrySet()) {
                     for (Map.Entry<String, ElementStateHolder> queryState :
                             partitionIdState.getValue().queryStateHolderMap.entrySet()) {
@@ -196,6 +197,7 @@ public IncrementalSnapshot incrementalSnapshot() {
             }
             try {
                 threadBarrier.lock();
+                waitForSystemStabilization();
                 for (Map.Entry<String, PartitionIdStateHolder> partitionIdState : partitionIdStates.entrySet()) {
                     for (Map.Entry<String, ElementStateHolder> queryState :
                             partitionIdState.getValue().queryStateHolderMap.entrySet()) {
@@ -296,6 +298,7 @@ public Map<String, Object> queryState(String queryName) {
         try {
             // Lock the threads in Siddhi
             threadBarrier.lock();
+            waitForSystemStabilization();
             PartitionIdStateHolder partitionIdStateHolder = partitionIdStates.get("");
             if (partitionIdStateHolder != null) {
                 ElementStateHolder elementStateHolder = partitionIdStateHolder.queryStateHolderMap.get(queryName);
@@ -341,7 +344,11 @@ public void restore(byte[] snapshot) throws CannotRestoreSiddhiAppStateException
         }
         try {
             threadBarrier.lock();
+            waitForSystemStabilization();
             try {
+                //cleaning old group by states
+                cleanGroupByStates();
+                //restore data
                 for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, Object>>>>> partitionIdSnapshot :
                         fullSnapshot.entrySet()) {
                     PartitionIdStateHolder partitionStateHolder = partitionIdStates.get(partitionIdSnapshot.getKey());
@@ -427,7 +434,11 @@ public void restore(Map<String, Map<String, Map<String, Map<Long, Map<Incrementa
             throws CannotRestoreSiddhiAppStateException {
         try {
             threadBarrier.lock();
+            waitForSystemStabilization();
             try {
+                //cleaning old group by states
+                cleanGroupByStates();
+                //restore data
                 for (Map.Entry<String, Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>>
                         partitionIdSnapshot : snapshot.entrySet()) {
                     PartitionIdStateHolder partitionStateHolder = partitionIdStates.get(partitionIdSnapshot.getKey());
@@ -728,6 +739,44 @@ public void clearAllRevisions() throws CannotClearSiddhiAppStateException {
         }
     }
 
+    private void cleanGroupByStates() {
+        for (Map.Entry<String, PartitionIdStateHolder> partitionIdState : partitionIdStates.entrySet()) {
+            for (Map.Entry<String, ElementStateHolder> queryState :
+                    partitionIdState.getValue().queryStateHolderMap.entrySet()) {
+                for (Map.Entry<String, StateHolder> elementState :
+                        queryState.getValue().elementHolderMap.entrySet()) {
+                    elementState.getValue().getAllGroupByStates();
+                }
+            }
+        }
+    }
+
+    private void waitForSystemStabilization() {
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            throw new SiddhiAppRuntimeException("Stabilization of Siddhi App " + siddhiAppContext.getName() +
+                    " for snapshot/restore interrupted. " + e.getMessage(), e);
+        }
+        int retryCount = 100;
+        int activeThreads = siddhiAppContext.getThreadBarrier().getActiveThreads();
+        while (activeThreads != 0 && retryCount > 0) {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                throw new SiddhiAppRuntimeException("Stabilization of Siddhi App " + siddhiAppContext.getName() +
+                        " for snapshot/restore interrupted. " + e.getMessage(), e);
+            }
+            activeThreads = siddhiAppContext.getThreadBarrier().getActiveThreads();
+            retryCount--;
+        }
+        if (retryCount == 0) {
+            throw new SiddhiAppRuntimeException("Siddhi App " + siddhiAppContext.getName() +
+                    " not stabilized for snapshot/restore, Active thread count is " +
+                    activeThreads);
+        }
+    }
+
     class PartitionIdStateHolder {
         private final String partitionId;
         private final Map<String, ElementStateHolder> queryStateHolderMap = new HashMap<>();

From 809c5d6ccf9fe1d134e645e73f631d92ee31b02e Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Wed, 27 Mar 2019 12:37:35 +0530
Subject: [PATCH 12/21] Optimize group by data cleaning

---
 .../core/aggregation/BaseIncrementalValueStore.java    | 10 +---------
 .../io/siddhi/core/util/snapshot/SnapshotService.java  |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
index f02dd2a7c7..4d7d78b5b5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
@@ -69,15 +69,7 @@ public void clearValues(long startTimeOfNewAggregates, StreamEvent resetEvent) {
         this.initialTimestamp = startTimeOfNewAggregates;
         setTimestamp(startTimeOfNewAggregates);
         setProcessed(false);
-        Map<String, ValueState> states = this.valueStateHolder.getAllGroupByStates();
-        try {
-            for (ValueState storeState : states.values()) {
-                storeState.values = null;
-                storeState.lastTimestamp = 0;
-            }
-        } finally {
-            this.valueStateHolder.returnGroupByStates(states);
-        }
+        this.valueStateHolder.cleanGroupByStates();
     }
 
     public void setValue(Object value, int position) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
index 1d8a61895e..c114d64075 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
@@ -745,7 +745,7 @@ private void cleanGroupByStates() {
                     partitionIdState.getValue().queryStateHolderMap.entrySet()) {
                 for (Map.Entry<String, StateHolder> elementState :
                         queryState.getValue().elementHolderMap.entrySet()) {
-                    elementState.getValue().getAllGroupByStates();
+                    elementState.getValue().cleanGroupByStates();
                 }
             }
         }

From 693948e5b2e13e1c65c897cddb852297ecb9b3fe Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Wed, 27 Mar 2019 17:55:28 +0530
Subject: [PATCH 13/21] Remove event pools

Remove Stream and State Event Pools

They are not used anymore
---
 .../BaseIncrementalValueStore.java            |  10 +-
 .../IncrementalAggregationProcessor.java      |  12 +-
 .../IncrementalDataAggregator.java            |  10 +-
 .../aggregation/IncrementalDataPurging.java   |  10 +-
 .../core/aggregation/IncrementalExecutor.java |  12 +-
 ...mentalExternalTimestampDataAggregator.java |  10 +-
 .../aggregation/RecreateInMemoryData.java     |   8 +-
 .../core/event/state/StateEventCloner.java    |  20 +-
 .../core/event/state/StateEventFactory.java   |   5 +
 .../core/event/state/StateEventPool.java      |  96 ---------
 .../core/event/stream/StreamEventCloner.java  |  20 +-
 .../core/event/stream/StreamEventPool.java    |  96 ---------
 .../converter/ConversionStreamEventChunk.java |  49 ++---
 .../converter/FaultStreamEventConverter.java  |  54 +++---
 .../SelectiveStreamEventConverter.java        |  24 +--
 .../converter/SimpleStreamEventConverter.java |  20 +-
 .../converter/StreamEventConverter.java       |  30 +--
 .../converter/ZeroStreamEventConverter.java   |  23 ++-
 .../partition/PartitionStreamReceiver.java    |  44 ++---
 .../core/query/DeleteStoreQueryRuntime.java   |   2 +-
 .../core/query/FindStoreQueryRuntime.java     |   4 +-
 .../core/query/InsertStoreQueryRuntime.java   |   2 +-
 .../siddhi/core/query/StoreQueryRuntime.java  |  10 +-
 .../UpdateOrInsertStoreQueryRuntime.java      |   2 +-
 .../core/query/UpdateStoreQueryRuntime.java   |   2 +-
 .../input/MultiProcessStreamReceiver.java     |  60 +++---
 .../query/input/ProcessStreamReceiver.java    |  34 ++--
 .../input/stream/join/JoinProcessor.java      |  10 +-
 .../state/AbsentLogicalPreStateProcessor.java |   6 +-
 .../state/AbsentStreamPreStateProcessor.java  |   2 +-
 .../stream/state/StreamPreStateProcessor.java |  32 +--
 .../output/callback/DeleteTableCallback.java  |  20 +-
 .../callback/InsertIntoTableCallback.java     |  10 +-
 .../query/output/callback/OutputCallback.java |  14 +-
 .../callback/UpdateOrInsertTableCallback.java |  22 +--
 .../output/callback/UpdateTableCallback.java  |  25 +--
 ...nWindowedPerSnapshotOutputRateLimiter.java |   4 +-
 ...yWindowedPerSnapshotOutputRateLimiter.java |   4 +-
 ...gregationPerSnapshotOutputRateLimiter.java |   4 +-
 .../GroupByPerSnapshotOutputRateLimiter.java  |   4 +-
 .../PerSnapshotOutputRateLimiter.java         |   4 +-
 .../WindowedPerSnapshotOutputRateLimiter.java |   6 +-
 .../WrappedSnapshotOutputRateLimiter.java     |  12 +-
 .../time/AllPerTimeOutputRateLimiter.java     |   4 +-
 .../FirstGroupByPerTimeOutputRateLimiter.java |   4 +-
 .../time/FirstPerTimeOutputRateLimiter.java   |   4 +-
 .../LastGroupByPerTimeOutputRateLimiter.java  |   4 +-
 .../time/LastPerTimeOutputRateLimiter.java    |   4 +-
 .../io/siddhi/core/stream/StreamJunction.java |  10 +-
 .../io/siddhi/core/table/InMemoryTable.java   |   4 +-
 .../main/java/io/siddhi/core/table/Table.java |   6 +-
 .../core/table/holder/IndexEventHolder.java   |  16 +-
 .../core/table/holder/ListEventHolder.java    |  10 +-
 .../record/AbstractQueryableRecordTable.java  |   2 +-
 .../table/record/AbstractRecordTable.java     |   8 +-
 .../java/io/siddhi/core/util/Scheduler.java   |  11 +-
 .../IncrementalAggregateCompileCondition.java |  18 +-
 .../core/util/parser/AggregationParser.java   |   6 +-
 .../core/util/parser/EventHolderPasser.java   |  10 +-
 .../siddhi/core/util/parser/OutputParser.java |  26 +--
 .../core/util/parser/StoreQueryParser.java    |  20 +-
 .../parser/helper/DefinitionParserHelper.java |   8 +-
 .../util/parser/helper/QueryParserHelper.java |  32 +--
 .../java/io/siddhi/core/window/Window.java    |  16 +-
 .../SnapshotableEventQueueTestCase.java       |  12 +-
 .../siddhi/core/stream/JunctionTestCase.java  | 183 ------------------
 .../event/ComplexEventChunkTestCase.java      |  26 +--
 .../core/stream/event/EventTestCase.java      |  69 +++----
 68 files changed, 478 insertions(+), 883 deletions(-)
 delete mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventPool.java
 delete mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventPool.java

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
index 4d7d78b5b5..5d8a960ca1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/BaseIncrementalValueStore.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.util.snapshot.state.PartitionSyncStateHolder;
@@ -41,17 +41,17 @@ public class BaseIncrementalValueStore {
     private StateHolder<ValueState> valueStateHolder;
     private StateHolder<StoreState> storeStateHolder;
     private List<ExpressionExecutor> expressionExecutors;
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
     private ExpressionExecutor shouldUpdateTimestamp;
     private long initialTimestamp;
 
     public BaseIncrementalValueStore(List<ExpressionExecutor> expressionExecutors,
-                                     StreamEventPool streamEventPool,
+                                     StreamEventFactory streamEventFactory,
                                      SiddhiQueryContext siddhiQueryContext, String aggregatorName,
                                      ExpressionExecutor shouldUpdateTimestamp, long initialTimestamp,
                                      boolean groupBy, boolean local) {
         this.expressionExecutors = expressionExecutors;
-        this.streamEventPool = streamEventPool;
+        this.streamEventFactory = streamEventFactory;
         this.shouldUpdateTimestamp = shouldUpdateTimestamp;
         this.initialTimestamp = initialTimestamp;
         if (!local) {
@@ -128,7 +128,7 @@ public Map<String, StreamEvent> getGroupedByEvents() {
             Map<String, ValueState> baseIncrementalValueStoreMap = this.valueStateHolder.getAllGroupByStates();
             try {
                 for (Map.Entry<String, ValueState> state : baseIncrementalValueStoreMap.entrySet()) {
-                    StreamEvent streamEvent = streamEventPool.borrowEvent();
+                    StreamEvent streamEvent = streamEventFactory.newInstance();
                     long timestamp = getTimestamp();
                     streamEvent.setTimestamp(timestamp);
                     state.getValue().setValue(timestamp, 0);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalAggregationProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalAggregationProcessor.java
index f98b12d040..6d4eb6ae69 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalAggregationProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalAggregationProcessor.java
@@ -23,7 +23,7 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.exception.SiddhiAppCreationException;
 import io.siddhi.core.exception.SiddhiAppRuntimeException;
 import io.siddhi.core.executor.ExpressionExecutor;
@@ -40,7 +40,7 @@
  */
 public class IncrementalAggregationProcessor implements Processor {
     private final List<ExpressionExecutor> incomingExpressionExecutors;
-    private final StreamEventPool streamEventPool;
+    private final StreamEventFactory streamEventFactory;
     private final LatencyTracker latencyTrackerInsert;
     private final ThroughputTracker throughputTrackerInsert;
     private SiddhiAppContext siddhiAppContext;
@@ -57,7 +57,7 @@ public IncrementalAggregationProcessor(AggregationRuntime aggregationRuntime,
         this.isFirstEventArrived = false;
         this.aggregationRuntime = aggregationRuntime;
         this.incomingExpressionExecutors = incomingExpressionExecutors;
-        this.streamEventPool = new StreamEventPool(processedMetaStreamEvent, 5);
+        this.streamEventFactory = new StreamEventFactory(processedMetaStreamEvent);
         this.latencyTrackerInsert = latencyTrackerInsert;
         this.throughputTrackerInsert = throughputTrackerInsert;
         this.siddhiAppContext = siddhiAppContext;
@@ -78,16 +78,16 @@ public void process(ComplexEventChunk complexEventChunk) {
                     aggregationRuntime.recreateInMemoryData(true, false);
                     isFirstEventArrived = true;
                 }
-                StreamEvent borrowedEvent = streamEventPool.borrowEvent();
+                StreamEvent newEvent = streamEventFactory.newInstance();
                 for (int i = 0; i < incomingExpressionExecutors.size(); i++) {
                     ExpressionExecutor expressionExecutor = incomingExpressionExecutors.get(i);
                     Object outputData = expressionExecutor.execute(complexEvent);
                     if (expressionExecutor instanceof IncrementalUnixTimeFunctionExecutor && outputData == null) {
                         throw new SiddhiAppRuntimeException("Cannot retrieve the timestamp of event");
                     }
-                    borrowedEvent.setOutputData(outputData, i);
+                    newEvent.setOutputData(outputData, i);
                 }
-                streamEventChunk.add(borrowedEvent);
+                streamEventChunk.add(newEvent);
                 noOfEvents++;
             }
             aggregationRuntime.processEvents(streamEventChunk);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
index de675fdc3d..e00b6beaf3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataAggregator.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.util.IncrementalTimeConverterUtil;
@@ -54,7 +54,7 @@ public class IncrementalDataAggregator {
     private final StreamEvent resetEvent;
     private final long oldestEventTimestamp;
     private ExpressionExecutor shouldUpdateTimestamp;
-    private final StreamEventPool streamEventPool;
+    private final StreamEventFactory streamEventFactory;
 
     public IncrementalDataAggregator(List<TimePeriod.Duration> incrementalDurations,
                                      TimePeriod.Duration durationToAggregate, long oldestEventTimestamp,
@@ -66,13 +66,13 @@ public IncrementalDataAggregator(List<TimePeriod.Duration> incrementalDurations,
         this.durationToAggregate = durationToAggregate;
         this.oldestEventTimestamp = oldestEventTimestamp;
         this.baseExecutorsForFind = baseExecutorsForFind;
-        streamEventPool = new StreamEventPool(metaStreamEvent, 10);
+        this.streamEventFactory = new StreamEventFactory(metaStreamEvent);
         if (groupBy) {
             this.valueStateHolder = new PartitionSyncStateHolder(() -> new ValueState());
         } else {
             this.valueStateHolder = new SingleSyncStateHolder(() -> new ValueState());
         }
-        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
+        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventFactory.newInstance());
         this.shouldUpdateTimestamp = shouldUpdateTimestamp;
     }
 
@@ -142,7 +142,7 @@ private ComplexEventChunk<StreamEvent> getProcessedEventChunk() {
         try {
             for (State aState : valueStoreMap.values()) {
                 ValueState state = (ValueState) aState;
-                StreamEvent streamEvent = streamEventPool.borrowEvent();
+                StreamEvent streamEvent = streamEventFactory.newInstance();
                 long timestamp = state.lastTimestamp;
                 streamEvent.setTimestamp(timestamp);
                 state.setValue(timestamp, 0);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataPurging.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataPurging.java
index c12dad630d..140b29cc84 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataPurging.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataPurging.java
@@ -24,7 +24,7 @@
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.exception.DataPurgingException;
 import io.siddhi.core.exception.SiddhiAppCreationException;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -66,7 +66,7 @@ public class IncrementalDataPurging implements Runnable {
     private long purgeExecutionInterval = Expression.Time.minute(15).value();
     private boolean purgingEnabled = true;
     private Map<TimePeriod.Duration, Long> retentionPeriods = new EnumMap<>(TimePeriod.Duration.class);
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
     private Map<TimePeriod.Duration, Table> aggregationTables;
     private SiddhiQueryContext siddhiQueryContext;
     private ScheduledFuture scheduledPurgingTaskStatus;
@@ -80,13 +80,13 @@ public class IncrementalDataPurging implements Runnable {
     private Map<String, Table> tableMap = new HashMap<>();
     private AggregationDefinition aggregationDefinition;
 
-    public void init(AggregationDefinition aggregationDefinition, StreamEventPool streamEventPool,
+    public void init(AggregationDefinition aggregationDefinition, StreamEventFactory streamEventFactory,
                      Map<TimePeriod.Duration, Table> aggregationTables, Boolean isProcessingOnExternalTime,
                      SiddhiQueryContext siddhiQueryContext) {
         this.siddhiQueryContext = siddhiQueryContext;
         this.aggregationDefinition = aggregationDefinition;
         List<Annotation> annotations = aggregationDefinition.getAnnotations();
-        this.streamEventPool = streamEventPool;
+        this.streamEventFactory = streamEventFactory;
         this.aggregationTables = aggregationTables;
         if (isProcessingOnExternalTime) {
             purgingTimestampField = EXTERNAL_AGG_TIMESTAMP_FIELD;
@@ -296,7 +296,7 @@ public void executeIncrementalDataPurging() {
      * creating stream event method
      **/
     private StateEvent createStreamEvent(Object[] values, Long timestamp) {
-        StreamEvent streamEvent = streamEventPool.borrowEvent();
+        StreamEvent streamEvent = streamEventFactory.newInstance();
         streamEvent.setTimestamp(timestamp);
         streamEvent.setOutputData(values);
         StateEvent stateEvent = new StateEvent(2, 1);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
index cdc7bed764..2fb45f8acc 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExecutor.java
@@ -24,7 +24,7 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.query.selector.GroupByKeyGenerator;
 import io.siddhi.core.table.Table;
@@ -52,7 +52,7 @@ public class IncrementalExecutor implements Executor {
     private TimePeriod.Duration duration;
     private Table table;
     private GroupByKeyGenerator groupByKeyGenerator;
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
     private Executor next;
     private Scheduler scheduler;
     private boolean isRoot;
@@ -69,13 +69,13 @@ public IncrementalExecutor(TimePeriod.Duration duration, List<ExpressionExecutor
         this.next = child;
         this.isRoot = isRoot;
         this.table = table;
-        this.streamEventPool = new StreamEventPool(metaStreamEvent, 10);
+        this.streamEventFactory = new StreamEventFactory(metaStreamEvent);
         this.timestampExpressionExecutor = processExpressionExecutors.remove(0);
         this.isProcessingExecutor = false;
         this.groupByKeyGenerator = groupByKeyGenerator;
-        this.baseIncrementalValueStore = new BaseIncrementalValueStore(processExpressionExecutors, streamEventPool,
+        this.baseIncrementalValueStore = new BaseIncrementalValueStore(processExpressionExecutors, streamEventFactory,
                 siddhiQueryContext, aggregatorName, shouldUpdateTimestamp, -1, true, false);
-        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
+        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventFactory.newInstance());
         setNextExecutor(child);
 
         this.stateHolder = siddhiQueryContext.generateStateHolder(
@@ -118,7 +118,7 @@ public void execute(ComplexEventChunk streamEventChunk) {
 
     private void sendTimerEvent(ExecutorState executorState) {
         if (getNextExecutor() != null) {
-            StreamEvent timerEvent = streamEventPool.borrowEvent();
+            StreamEvent timerEvent = streamEventFactory.newInstance();
             timerEvent.setType(ComplexEvent.Type.TIMER);
             timerEvent.setTimestamp(executorState.startTimeOfAggregates);
             ComplexEventChunk<StreamEvent> timerStreamEventChunk = new ComplexEventChunk<>(true);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
index 5c327f17a1..74e0c7f58b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalExternalTimestampDataAggregator.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.query.selector.GroupByKeyGenerator;
@@ -48,7 +48,7 @@ public class IncrementalExternalTimestampDataAggregator {
     private final List<ExpressionExecutor> baseExecutors;
     private final StateHolder valueStateHolder;
     private final StreamEvent resetEvent;
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
     private final ExpressionExecutor shouldUpdateTimestamp;
 
     public IncrementalExternalTimestampDataAggregator(List<ExpressionExecutor> baseExecutors,
@@ -57,7 +57,7 @@ public IncrementalExternalTimestampDataAggregator(List<ExpressionExecutor> baseE
                                                       SiddhiQueryContext siddhiQueryContext,
                                                       ExpressionExecutor shouldUpdateTimestamp) {
         this.baseExecutors = baseExecutors.subList(1, baseExecutors.size());
-        this.streamEventPool = new StreamEventPool(metaStreamEvent, 10);
+        this.streamEventFactory = new StreamEventFactory(metaStreamEvent);
         this.shouldUpdateTimestamp = shouldUpdateTimestamp;
         this.groupByKeyGenerator = groupByKeyGenerator;
         if (groupByKeyGenerator != null) {
@@ -65,7 +65,7 @@ public IncrementalExternalTimestampDataAggregator(List<ExpressionExecutor> baseE
         } else {
             this.valueStateHolder = new SingleSyncStateHolder(() -> new ValueState());
         }
-        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventPool.borrowEvent());
+        this.resetEvent = AggregationParser.createRestEvent(metaStreamEvent, streamEventFactory.newInstance());
     }
 
     public ComplexEventChunk<StreamEvent> aggregateData(ComplexEventChunk<StreamEvent> retrievedData) {
@@ -129,7 +129,7 @@ private ComplexEventChunk<StreamEvent> createEventChunkFromAggregatedData() {
         try {
             for (State aState : valueStoreMap.values()) {
                 ValueState state = (ValueState) aState;
-                StreamEvent streamEvent = streamEventPool.borrowEvent();
+                StreamEvent streamEvent = streamEventFactory.newInstance();
                 long timestamp = state.lastTimestamp;
                 streamEvent.setTimestamp(timestamp);
                 state.setValue(timestamp, 0);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/RecreateInMemoryData.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/RecreateInMemoryData.java
index 1259e821ff..3a70245fc7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/RecreateInMemoryData.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/RecreateInMemoryData.java
@@ -23,7 +23,7 @@
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.StoreQueryRuntime;
 import io.siddhi.core.table.Table;
 import io.siddhi.core.util.IncrementalTimeConverterUtil;
@@ -50,7 +50,7 @@ public class RecreateInMemoryData {
     private final Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMap;
     private final Map<TimePeriod.Duration, IncrementalExecutor> incrementalExecutorMapForPartitions;
     private final SiddhiAppContext siddhiAppContext;
-    private final StreamEventPool streamEventPool;
+    private final StreamEventFactory streamEventFactory;
     private final Map<String, Table> tableMap;
     private final Map<String, Window> windowMap;
     private final Map<String, AggregationRuntime> aggregationMap;
@@ -67,7 +67,7 @@ public RecreateInMemoryData(List<TimePeriod.Duration> incrementalDurations,
         this.aggregationTables = aggregationTables;
         this.incrementalExecutorMap = incrementalExecutorMap;
         this.siddhiAppContext = siddhiAppContext;
-        this.streamEventPool = new StreamEventPool(metaStreamEvent, 10);
+        this.streamEventFactory = new StreamEventFactory(metaStreamEvent);
         this.tableMap = tableMap;
         this.windowMap = windowMap;
         this.aggregationMap = aggregationMap;
@@ -163,7 +163,7 @@ public void recreateInMemoryData(boolean refreshReadingExecutors) {
 
                 ComplexEventChunk<StreamEvent> complexEventChunk = new ComplexEventChunk<>(false);
                 for (Event event : events) {
-                    StreamEvent streamEvent = streamEventPool.borrowEvent();
+                    StreamEvent streamEvent = streamEventFactory.newInstance();
                     streamEvent.setOutputData(event.getData());
                     complexEventChunk.add(streamEvent);
                 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventCloner.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventCloner.java
index 33ea14f022..bb87f32598 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventCloner.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventCloner.java
@@ -28,11 +28,11 @@ public class StateEventCloner {
     private final int streamEventSize;
     //    private final int preOutputDataSize;
     private final int outputDataSize;
-    private final StateEventPool stateEventPool;
+    private final StateEventFactory stateEventFactory;
 
-    public StateEventCloner(MetaStateEvent metaStateEvent, StateEventPool stateEventPool) {
+    public StateEventCloner(MetaStateEvent metaStateEvent, StateEventFactory stateEventFactory) {
 
-        this.stateEventPool = stateEventPool;
+        this.stateEventFactory = stateEventFactory;
         this.streamEventSize = metaStateEvent.getStreamEventCount();
 //        this.preOutputDataSize = metaStateEvent.getPreOutputDataAttributes().size();
         this.outputDataSize = metaStateEvent.getOutputDataAttributes().size();
@@ -46,16 +46,16 @@ public StateEventCloner(MetaStateEvent metaStateEvent, StateEventPool stateEvent
      * @return StateEvent
      */
     public StateEvent copyStateEvent(StateEvent stateEvent) {
-        StateEvent borrowedEvent = stateEventPool.borrowEvent();
+        StateEvent newEvent = stateEventFactory.newInstance();
         if (outputDataSize > 0) {
-            System.arraycopy(stateEvent.getOutputData(), 0, borrowedEvent.getOutputData(), 0, outputDataSize);
+            System.arraycopy(stateEvent.getOutputData(), 0, newEvent.getOutputData(), 0, outputDataSize);
         }
         if (streamEventSize > 0) {
-            System.arraycopy(stateEvent.getStreamEvents(), 0, borrowedEvent.getStreamEvents(), 0, streamEventSize);
+            System.arraycopy(stateEvent.getStreamEvents(), 0, newEvent.getStreamEvents(), 0, streamEventSize);
         }
-        borrowedEvent.setType(stateEvent.getType());
-        borrowedEvent.setTimestamp(stateEvent.getTimestamp());
-        borrowedEvent.setId(stateEvent.getId());
-        return borrowedEvent;
+        newEvent.setType(stateEvent.getType());
+        newEvent.setTimestamp(stateEvent.getTimestamp());
+        newEvent.setId(stateEvent.getId());
+        return newEvent;
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventFactory.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventFactory.java
index 2b9e78cf78..6c465efa8c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventFactory.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventFactory.java
@@ -32,6 +32,11 @@ public StateEventFactory(int eventSize, int outputDataSize) {
         this.outputDataSize = outputDataSize;
     }
 
+    public StateEventFactory(MetaStateEvent metaStateEvent) {
+        this.eventSize = metaStateEvent.getStreamEventCount();
+        this.outputDataSize = metaStateEvent.getOutputDataAttributes().size();
+    }
+
     public StateEvent newInstance() {
         return new StateEvent(eventSize, outputDataSize);
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventPool.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventPool.java
deleted file mode 100644
index e431315af4..0000000000
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/state/StateEventPool.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.core.event.state;
-
-/**
- * Event pool containing StreamEvent for reuse
- * This is not a thread safe implementation
- */
-public class StateEventPool {
-
-    private StateEventFactory eventFactory;
-    private int size;
-    private int index = 0;
-    private StateEvent stateEventList;
-    private long id = 0;
-
-    public StateEventPool(MetaStateEvent metaStateEvent, int size) {
-        eventFactory = new StateEventFactory(metaStateEvent.getStreamEventCount(),
-                metaStateEvent.getOutputDataAttributes().size());
-        this.size = size;
-    }
-
-//    public StateEventPool(int beforeWindowDataSize, int onAfterWindowDataSize, int outputDataSize, int poolSize) {
-//        eventFactory = new StreamEventFactory(beforeWindowDataSize, onAfterWindowDataSize, outputDataSize);
-//        this.size = poolSize;
-//    }
-
-    /**
-     * Borrowing an StateEvent
-     *
-     * @return if StateEvent exist in the pool an existing event if not a new StateEvent will be returned
-     */
-    public StateEvent borrowEvent() {
-        if (index > 0) {
-            StateEvent event = stateEventList;
-            stateEventList = stateEventList.getNext();
-            event.setNext(null);
-            index--;
-            event.setId(++id);
-            return event;
-        } else {
-            StateEvent event = eventFactory.newInstance();
-            event.setId(++id);
-            return event;
-        }
-    }
-
-    /**
-     * Collects the used InnerStreamEvents
-     * If the pool has space the returned event will be added to the pool else it will be dropped
-     *
-     * @param stateEvent used event
-     */
-    public void returnEvents(StateEvent stateEvent) {
-        if (stateEvent != null) {
-            if (index < size) {
-                StateEvent first = stateEvent;
-                StateEvent last = stateEvent;
-                while (stateEvent != null) {
-                    last = stateEvent;
-                    index++;
-                    stateEvent = stateEvent.getNext();
-                }
-                last.setNext(stateEventList);
-                stateEventList = first;
-            }
-        }
-
-    }
-
-    /**
-     * @return Occupied buffer size
-     */
-    public int getBufferedEventsSize() {
-        return index;
-    }
-
-    public int getSize() {
-        return size;
-    }
-}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventCloner.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventCloner.java
index dbae1a194b..d986cad2e4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventCloner.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventCloner.java
@@ -28,11 +28,11 @@ public class StreamEventCloner {
     private final int beforeWindowDataSize;
     private final int onAfterWindowDataSize;
     private final int outputDataSize;
-    private final StreamEventPool streamEventPool;
+    private final StreamEventFactory eventFactory;
 
-    public StreamEventCloner(MetaStreamEvent metaStreamEvent, StreamEventPool streamEventPool) {
+    public StreamEventCloner(MetaStreamEvent metaStreamEvent, StreamEventFactory eventFactory) {
 
-        this.streamEventPool = streamEventPool;
+        this.eventFactory = eventFactory;
         this.beforeWindowDataSize = metaStreamEvent.getBeforeWindowData().size();
         this.onAfterWindowDataSize = metaStreamEvent.getOnAfterWindowData().size();
         this.outputDataSize = metaStreamEvent.getOutputData().size();
@@ -46,20 +46,20 @@ public StreamEventCloner(MetaStreamEvent metaStreamEvent, StreamEventPool stream
      * @return StreamEvent
      */
     public StreamEvent copyStreamEvent(StreamEvent streamEvent) {
-        StreamEvent borrowedEvent = streamEventPool.borrowEvent();
+        StreamEvent newEvent = eventFactory.newInstance();
         if (beforeWindowDataSize > 0) {
-            System.arraycopy(streamEvent.getBeforeWindowData(), 0, borrowedEvent.getBeforeWindowData(), 0,
+            System.arraycopy(streamEvent.getBeforeWindowData(), 0, newEvent.getBeforeWindowData(), 0,
                     beforeWindowDataSize);
         }
         if (onAfterWindowDataSize > 0) {
-            System.arraycopy(streamEvent.getOnAfterWindowData(), 0, borrowedEvent.getOnAfterWindowData(), 0,
+            System.arraycopy(streamEvent.getOnAfterWindowData(), 0, newEvent.getOnAfterWindowData(), 0,
                     onAfterWindowDataSize);
         }
         if (outputDataSize > 0) {
-            System.arraycopy(streamEvent.getOutputData(), 0, borrowedEvent.getOutputData(), 0, outputDataSize);
+            System.arraycopy(streamEvent.getOutputData(), 0, newEvent.getOutputData(), 0, outputDataSize);
         }
-        borrowedEvent.setType(streamEvent.getType());
-        borrowedEvent.setTimestamp(streamEvent.getTimestamp());
-        return borrowedEvent;
+        newEvent.setType(streamEvent.getType());
+        newEvent.setTimestamp(streamEvent.getTimestamp());
+        return newEvent;
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventPool.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventPool.java
deleted file mode 100644
index 877b0e2f57..0000000000
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/StreamEventPool.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.siddhi.core.event.stream;
-
-import java.io.Serializable;
-
-/**
- * Event pool containing StreamEvent for reuse
- * This is not a thread safe implementation
- */
-public class StreamEventPool implements Serializable {
-
-    private static final long serialVersionUID = -1743558131917334571L;
-    private StreamEventFactory eventFactory;
-    private int size;
-    private int index = 0;
-    private StreamEvent streamEventList;
-
-    public StreamEventPool(MetaStreamEvent metaStreamEvent, int size) {
-        eventFactory = new StreamEventFactory(metaStreamEvent.getBeforeWindowData().size(),
-                metaStreamEvent.getOnAfterWindowData().size(),
-                metaStreamEvent.getOutputData().size());
-        this.size = size;
-    }
-
-    public StreamEventPool(int beforeWindowDataSize, int onAfterWindowDataSize, int outputDataSize, int poolSize) {
-        eventFactory = new StreamEventFactory(beforeWindowDataSize, onAfterWindowDataSize, outputDataSize);
-        this.size = poolSize;
-    }
-
-    /**
-     * Borrowing an StreamEvent
-     *
-     * @return if StreamEvent exist in the pool an existing event if not a new StreamEvent will be returned
-     */
-    public StreamEvent borrowEvent() {
-        if (index > 0) {
-            StreamEvent event = streamEventList;
-            streamEventList = streamEventList.getNext();
-            event.setNext(null);
-            index--;
-            return event;
-        } else {
-            return eventFactory.newInstance();
-        }
-    }
-
-    /**
-     * Collects the used InnerStreamEvents
-     * If the pool has space the returned event will be added to the pool else it will be dropped
-     *
-     * @param streamEvent used event
-     */
-    public void returnEvents(StreamEvent streamEvent) {
-        if (streamEvent != null) {
-            if (index < size) {
-                StreamEvent first = streamEvent;
-                StreamEvent last = streamEvent;
-                while (streamEvent != null) {
-                    last = streamEvent;
-                    index++;
-                    streamEvent = streamEvent.getNext();
-                }
-                last.setNext(streamEventList);
-                streamEventList = first;
-            }
-        }
-
-    }
-
-    /**
-     * @return Occupied buffer size
-     */
-    public int getBufferedEventsSize() {
-        return index;
-    }
-
-    public int getSize() {
-        return size;
-    }
-}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/ConversionStreamEventChunk.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/ConversionStreamEventChunk.java
index 22cacf9d18..30c988ed79 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/ConversionStreamEventChunk.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/ConversionStreamEventChunk.java
@@ -23,7 +23,7 @@
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 
 /**
  * A StreamEvent holder that can also convert other events into StreamEvents
@@ -32,53 +32,54 @@ public class ConversionStreamEventChunk extends ComplexEventChunk<StreamEvent> {
 
     private static final long serialVersionUID = 2754352338846132676L;
     private StreamEventConverter streamEventConverter;
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
 
-    public ConversionStreamEventChunk(MetaStreamEvent metaStreamEvent, StreamEventPool streamEventPool) {
+    public ConversionStreamEventChunk(MetaStreamEvent metaStreamEvent, StreamEventFactory streamEventFactory) {
         super(false);
-        this.streamEventPool = streamEventPool;
+        this.streamEventFactory = streamEventFactory;
         streamEventConverter = StreamEventConverterFactory.constructEventConverter(metaStreamEvent);
     }
 
-    public ConversionStreamEventChunk(StreamEventConverter streamEventConverter, StreamEventPool streamEventPool) {
+    public ConversionStreamEventChunk(StreamEventConverter streamEventConverter,
+                                      StreamEventFactory streamEventFactory) {
         super(false);
         this.streamEventConverter = streamEventConverter;
-        this.streamEventPool = streamEventPool;
+        this.streamEventFactory = streamEventFactory;
     }
 
     public void convertAndAssign(Event event) {
-        StreamEvent borrowedEvent = streamEventPool.borrowEvent();
-        streamEventConverter.convertEvent(event, borrowedEvent);
-        first = borrowedEvent;
+        StreamEvent newEvent = streamEventFactory.newInstance();
+        streamEventConverter.convertEvent(event, newEvent);
+        first = newEvent;
         last = first;
     }
 
     public void convertAndAssign(long timestamp, Object[] data) {
-        StreamEvent borrowedEvent = streamEventPool.borrowEvent();
-        streamEventConverter.convertData(timestamp, data, borrowedEvent);
-        first = borrowedEvent;
+        StreamEvent newEvent = streamEventFactory.newInstance();
+        streamEventConverter.convertData(timestamp, data, newEvent);
+        first = newEvent;
         last = first;
     }
 
     public void convertAndAssign(ComplexEvent complexEvent) {
-        first = streamEventPool.borrowEvent();
+        first = streamEventFactory.newInstance();
         last = convertAllStreamEvents(complexEvent, first);
     }
 
 //    @Override
 //    public void convertAndAssignFirst(StreamEvent streamEvent) {
-//        StreamEvent borrowedEvent = streamEventPool.borrowEvent();
-//        eventConverter.convertComplexEvent(streamEvent, borrowedEvent);
-//        first = borrowedEvent;
+//        StreamEvent newEvent = streamEventFactory.borrowEvent();
+//        eventConverter.convertComplexEvent(streamEvent, newEvent);
+//        first = newEvent;
 //        last = first;
 //    }
 
     public void convertAndAssign(Event[] events) {
-        StreamEvent firstEvent = streamEventPool.borrowEvent();
+        StreamEvent firstEvent = streamEventFactory.newInstance();
         streamEventConverter.convertEvent(events[0], firstEvent);
         StreamEvent currentEvent = firstEvent;
         for (int i = 1, eventsLength = events.length; i < eventsLength; i++) {
-            StreamEvent nextEvent = streamEventPool.borrowEvent();
+            StreamEvent nextEvent = streamEventFactory.newInstance();
             streamEventConverter.convertEvent(events[i], nextEvent);
             currentEvent.setNext(nextEvent);
             currentEvent = nextEvent;
@@ -88,15 +89,15 @@ public void convertAndAssign(Event[] events) {
     }
 
     public void convertAndAdd(Event event) {
-        StreamEvent borrowedEvent = streamEventPool.borrowEvent();
-        streamEventConverter.convertEvent(event, borrowedEvent);
+        StreamEvent newEvent = streamEventFactory.newInstance();
+        streamEventConverter.convertEvent(event, newEvent);
 
         if (first == null) {
-            first = borrowedEvent;
+            first = newEvent;
             last = first;
         } else {
-            last.setNext(borrowedEvent);
-            last = borrowedEvent;
+            last.setNext(newEvent);
+            last = newEvent;
         }
 
     }
@@ -106,7 +107,7 @@ private StreamEvent convertAllStreamEvents(ComplexEvent complexEvents, StreamEve
         StreamEvent currentEvent = firstEvent;
         complexEvents = complexEvents.getNext();
         while (complexEvents != null) {
-            StreamEvent nextEvent = streamEventPool.borrowEvent();
+            StreamEvent nextEvent = streamEventFactory.newInstance();
             streamEventConverter.convertComplexEvent(complexEvents, nextEvent);
             currentEvent.setNext(nextEvent);
             currentEvent = nextEvent;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/FaultStreamEventConverter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/FaultStreamEventConverter.java
index a566d4285b..efc0361d84 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/FaultStreamEventConverter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/FaultStreamEventConverter.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 
 import java.util.List;
 
@@ -30,32 +30,32 @@
  */
 public class FaultStreamEventConverter {
 
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
 
-    public FaultStreamEventConverter(StreamEventPool streamEventPool) {
-        this.streamEventPool = streamEventPool;
+    public FaultStreamEventConverter(StreamEventFactory streamEventFactory) {
+        this.streamEventFactory = streamEventFactory;
     }
 
 
     public StreamEvent convert(Event event, Exception e) {
-        StreamEvent borrowedEvent = streamEventPool.borrowEvent();
-        convertEvent(event, borrowedEvent, e);
-        return borrowedEvent;
+        StreamEvent newEvent = streamEventFactory.newInstance();
+        convertEvent(event, newEvent, e);
+        return newEvent;
     }
 
     public StreamEvent convert(long timestamp, Object[] data, Exception e) {
-        StreamEvent borrowedEvent = streamEventPool.borrowEvent();
-        convertData(timestamp, data, borrowedEvent, e);
-        return borrowedEvent;
+        StreamEvent newEvent = streamEventFactory.newInstance();
+        convertData(timestamp, data, newEvent, e);
+        return newEvent;
     }
 
     public StreamEvent convert(ComplexEvent complexEvents, Exception e) {
-        StreamEvent firstEvent = streamEventPool.borrowEvent();
+        StreamEvent firstEvent = streamEventFactory.newInstance();
         convertComplexEvent(complexEvents, firstEvent, e);
         StreamEvent currentEvent = firstEvent;
         complexEvents = complexEvents.getNext();
         while (complexEvents != null) {
-            StreamEvent nextEvent = streamEventPool.borrowEvent();
+            StreamEvent nextEvent = streamEventFactory.newInstance();
             convertComplexEvent(complexEvents, nextEvent, e);
             currentEvent.setNext(nextEvent);
             currentEvent = nextEvent;
@@ -65,11 +65,11 @@ public StreamEvent convert(ComplexEvent complexEvents, Exception e) {
     }
 
     public StreamEvent convert(Event[] events, Exception e) {
-        StreamEvent firstEvent = streamEventPool.borrowEvent();
+        StreamEvent firstEvent = streamEventFactory.newInstance();
         convertEvent(events[0], firstEvent, e);
         StreamEvent currentEvent = firstEvent;
         for (int i = 1, eventsLength = events.length; i < eventsLength; i++) {
-            StreamEvent nextEvent = streamEventPool.borrowEvent();
+            StreamEvent nextEvent = streamEventFactory.newInstance();
             convertEvent(events[i], nextEvent, e);
             currentEvent.setNext(nextEvent);
             currentEvent = nextEvent;
@@ -78,11 +78,11 @@ public StreamEvent convert(Event[] events, Exception e) {
     }
 
     public StreamEvent convert(List<Event> events, Exception e) {
-        StreamEvent firstEvent = streamEventPool.borrowEvent();
+        StreamEvent firstEvent = streamEventFactory.newInstance();
         convertEvent(events.get(0), firstEvent, e);
         StreamEvent currentEvent = firstEvent;
         for (int i = 1, eventsLength = events.size(); i < eventsLength; i++) {
-            StreamEvent nextEvent = streamEventPool.borrowEvent();
+            StreamEvent nextEvent = streamEventFactory.newInstance();
             convertEvent(events.get(i), nextEvent, e);
             currentEvent.setNext(nextEvent);
             currentEvent = nextEvent;
@@ -90,28 +90,28 @@ public StreamEvent convert(List<Event> events, Exception e) {
         return firstEvent;
     }
 
-    private void convertData(long timestamp, Object[] data, StreamEvent.Type type, StreamEvent borrowedEvent,
+    private void convertData(long timestamp, Object[] data, StreamEvent.Type type, StreamEvent newEvent,
                              Exception e) {
-        System.arraycopy(data, 0, borrowedEvent.getOutputData(), 0, data.length);
-        borrowedEvent.setOutputData(e, data.length);
-        borrowedEvent.setType(type);
-        borrowedEvent.setTimestamp(timestamp);
+        System.arraycopy(data, 0, newEvent.getOutputData(), 0, data.length);
+        newEvent.setOutputData(e, data.length);
+        newEvent.setType(type);
+        newEvent.setTimestamp(timestamp);
     }
 
 
-    private void convertEvent(Event event, StreamEvent borrowedEvent, Exception e) {
+    private void convertEvent(Event event, StreamEvent newEvent, Exception e) {
         convertData(event.getTimestamp(), event.getData(),
                 event.isExpired() ? StreamEvent.Type.EXPIRED : StreamEvent.Type.CURRENT,
-                borrowedEvent, e);
+                newEvent, e);
     }
 
-    private void convertComplexEvent(ComplexEvent complexEvent, StreamEvent borrowedEvent, Exception e) {
+    private void convertComplexEvent(ComplexEvent complexEvent, StreamEvent newEvent, Exception e) {
         convertData(complexEvent.getTimestamp(), complexEvent.getOutputData(), complexEvent.getType(),
-                borrowedEvent, e);
+                newEvent, e);
     }
 
-    private void convertData(long timeStamp, Object[] data, StreamEvent borrowedEvent, Exception e) {
-        convertData(timeStamp, data, StreamEvent.Type.CURRENT, borrowedEvent, e);
+    private void convertData(long timeStamp, Object[] data, StreamEvent newEvent, Exception e) {
+        convertData(timeStamp, data, StreamEvent.Type.CURRENT, newEvent, e);
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/SelectiveStreamEventConverter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/SelectiveStreamEventConverter.java
index d9ef080390..15b5c91807 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/SelectiveStreamEventConverter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/SelectiveStreamEventConverter.java
@@ -36,44 +36,44 @@ public SelectiveStreamEventConverter(List<ConversionMapping> conversionMappings)
         this.conversionMappings = conversionMappings;
     }
 
-    public void convertData(long timestamp, Object[] data, StreamEvent.Type type, StreamEvent borrowedEvent) {
+    public void convertData(long timestamp, Object[] data, StreamEvent.Type type, StreamEvent newEvent) {
         for (ConversionMapping conversionMapping : conversionMappings) {
             int[] position = conversionMapping.getToPosition();
             int fromPosition = conversionMapping.getFromPosition();
             switch (position[0]) {
                 case 0:
-                    borrowedEvent.setBeforeWindowData(data[fromPosition], position[1]);
+                    newEvent.setBeforeWindowData(data[fromPosition], position[1]);
                     break;
                 case 1:
-                    borrowedEvent.setOnAfterWindowData(data[fromPosition], position[1]);
+                    newEvent.setOnAfterWindowData(data[fromPosition], position[1]);
                     break;
                 case 2:
-                    borrowedEvent.setOutputData(data[fromPosition], position[1]);
+                    newEvent.setOutputData(data[fromPosition], position[1]);
                     break;
                 default:
                     //can not happen
             }
         }
 
-        borrowedEvent.setType(type);
-        borrowedEvent.setTimestamp(timestamp);
+        newEvent.setType(type);
+        newEvent.setTimestamp(timestamp);
     }
 
 
-    public void convertEvent(Event event, StreamEvent borrowedEvent) {
+    public void convertEvent(Event event, StreamEvent newEvent) {
         convertData(event.getTimestamp(), event.getData(), event.isExpired() ? StreamEvent.Type.EXPIRED : StreamEvent
                         .Type.CURRENT,
-                borrowedEvent);
+                newEvent);
     }
 
-    public void convertComplexEvent(ComplexEvent complexEvent, StreamEvent borrowedEvent) {
+    public void convertComplexEvent(ComplexEvent complexEvent, StreamEvent newEvent) {
         convertData(complexEvent.getTimestamp(), complexEvent.getOutputData(), complexEvent.getType(),
-                borrowedEvent);
+                newEvent);
     }
 
     @Override
-    public void convertData(long timeStamp, Object[] data, StreamEvent borrowedEvent) {
-        convertData(timeStamp, data, StreamEvent.Type.CURRENT, borrowedEvent);
+    public void convertData(long timeStamp, Object[] data, StreamEvent newEvent) {
+        convertData(timeStamp, data, StreamEvent.Type.CURRENT, newEvent);
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/SimpleStreamEventConverter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/SimpleStreamEventConverter.java
index 53fb782676..b3e46439d5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/SimpleStreamEventConverter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/SimpleStreamEventConverter.java
@@ -35,28 +35,28 @@ public SimpleStreamEventConverter(List<ConversionMapping> conversionMappings) {
         this.conversionMappings = conversionMappings;
     }
 
-    public void convertData(long timestamp, Object[] data, StreamEvent.Type type, StreamEvent borrowedEvent) {
+    public void convertData(long timestamp, Object[] data, StreamEvent.Type type, StreamEvent newEvent) {
         for (ConversionMapping element : conversionMappings) {
-            borrowedEvent.setOutputData(data[element.getFromPosition()], element.getToPosition()[1]);
+            newEvent.setOutputData(data[element.getFromPosition()], element.getToPosition()[1]);
         }
-        borrowedEvent.setType(type);
-        borrowedEvent.setTimestamp(timestamp);
+        newEvent.setType(type);
+        newEvent.setTimestamp(timestamp);
     }
 
-    public void convertEvent(Event event, StreamEvent borrowedEvent) {
+    public void convertEvent(Event event, StreamEvent newEvent) {
         convertData(event.getTimestamp(), event.getData(), event.isExpired() ? StreamEvent.Type.EXPIRED : StreamEvent
                         .Type.CURRENT,
-                borrowedEvent);
+                newEvent);
     }
 
-    public void convertComplexEvent(ComplexEvent complexEvent, StreamEvent borrowedEvent) {
+    public void convertComplexEvent(ComplexEvent complexEvent, StreamEvent newEvent) {
         convertData(complexEvent.getTimestamp(), complexEvent.getOutputData(), complexEvent.getType(),
-                borrowedEvent);
+                newEvent);
     }
 
     @Override
-    public void convertData(long timestamp, Object[] data, StreamEvent borrowedEvent) {
-        convertData(timestamp, data, StreamEvent.Type.CURRENT, borrowedEvent);
+    public void convertData(long timestamp, Object[] data, StreamEvent newEvent) {
+        convertData(timestamp, data, StreamEvent.Type.CURRENT, newEvent);
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/StreamEventConverter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/StreamEventConverter.java
index 3089c4f5a5..4f600d5c99 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/StreamEventConverter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/StreamEventConverter.java
@@ -31,37 +31,37 @@ public interface StreamEventConverter {
     /**
      * Method to construct StreamEvent form Event
      *
-     * @param event         Event to be converted
-     * @param borrowedEvent Event that will be populated
+     * @param event    Event to be converted
+     * @param newEvent Event that will be populated
      */
-    void convertEvent(Event event, StreamEvent borrowedEvent);
+    void convertEvent(Event event, StreamEvent newEvent);
 
     /**
      * Method to construct(change format) new StreamEvent from StreamEvent
      *
-     * @param complexEvent  StreamEvent to be Converted
-     * @param borrowedEvent Event that will be populated
+     * @param complexEvent StreamEvent to be Converted
+     * @param newEvent     Event that will be populated
      */
-    void convertComplexEvent(ComplexEvent complexEvent, StreamEvent borrowedEvent);
+    void convertComplexEvent(ComplexEvent complexEvent, StreamEvent newEvent);
 
     /**
      * Method to construct(change format) timeStamp and data from StreamEvent
      *
-     * @param timeStamp     timeStamp of the event
-     * @param data          output data of the event
-     * @param borrowedEvent Event that will be populated
+     * @param timeStamp timeStamp of the event
+     * @param data      output data of the event
+     * @param newEvent  Event that will be populated
      */
-    void convertData(long timeStamp, Object[] data, StreamEvent borrowedEvent);
+    void convertData(long timeStamp, Object[] data, StreamEvent newEvent);
 
     /**
      * Method to construct(change format) timeStamp and data from StreamEvent
      *
-     * @param timeStamp     timeStamp of the event
-     * @param data          output data of the event
-     * @param type          output type of the event
-     * @param borrowedEvent Event that will be populated
+     * @param timeStamp timeStamp of the event
+     * @param data      output data of the event
+     * @param type      output type of the event
+     * @param newEvent  Event that will be populated
      */
-    void convertData(long timeStamp, Object[] data, StreamEvent.Type type, StreamEvent borrowedEvent);
+    void convertData(long timeStamp, Object[] data, StreamEvent.Type type, StreamEvent newEvent);
 
     /**
      * Element to hold information about event conversion
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/ZeroStreamEventConverter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/ZeroStreamEventConverter.java
index f9cc78eab9..9ff9281dd4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/ZeroStreamEventConverter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/event/stream/converter/ZeroStreamEventConverter.java
@@ -30,26 +30,25 @@ public class ZeroStreamEventConverter implements StreamEventConverter, Serializa
 
     private static final long serialVersionUID = 2223375413250580450L;
 
-    public void convertData(long timestamp, Object[] data, StreamEvent.Type type, StreamEvent borrowedEvent) {
-        System.arraycopy(data, 0, borrowedEvent.getOutputData(), 0, data.length);
-        borrowedEvent.setType(type);
-        borrowedEvent.setTimestamp(timestamp);
+    public void convertData(long timestamp, Object[] data, StreamEvent.Type type, StreamEvent newEvent) {
+        System.arraycopy(data, 0, newEvent.getOutputData(), 0, data.length);
+        newEvent.setType(type);
+        newEvent.setTimestamp(timestamp);
     }
 
-    public void convertEvent(Event event, StreamEvent borrowedEvent) {
-        convertData(event.getTimestamp(), event.getData(), event.isExpired() ? StreamEvent.Type.EXPIRED : StreamEvent
-                        .Type.CURRENT,
-                borrowedEvent);
+    public void convertEvent(Event event, StreamEvent newEvent) {
+        convertData(event.getTimestamp(), event.getData(), event.isExpired() ? StreamEvent.Type.EXPIRED :
+                StreamEvent.Type.CURRENT, newEvent);
     }
 
-    public void convertComplexEvent(ComplexEvent complexEvent, StreamEvent borrowedEvent) {
+    public void convertComplexEvent(ComplexEvent complexEvent, StreamEvent newEvent) {
         convertData(complexEvent.getTimestamp(), complexEvent.getOutputData(), complexEvent.getType(),
-                borrowedEvent);
+                newEvent);
     }
 
     @Override
-    public void convertData(long timestamp, Object[] data, StreamEvent borrowedEvent) {
-        convertData(timestamp, data, StreamEvent.Type.CURRENT, borrowedEvent);
+    public void convertData(long timestamp, Object[] data, StreamEvent newEvent) {
+        convertData(timestamp, data, StreamEvent.Type.CURRENT, newEvent);
     }
 
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
index 0ec1374be8..f054912071 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
@@ -84,21 +84,19 @@ public void receive(ComplexEvent complexEvent) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
             ComplexEvent aComplexEvent = complexEvent;
             while (aComplexEvent != null) {
-                StreamEvent borrowedEvent = streamEventFactory.newInstance();
-                ;
-                streamEventConverter.convertComplexEvent(aComplexEvent, borrowedEvent);
-                outputEventChunk.add(borrowedEvent);
+                StreamEvent newEvent = streamEventFactory.newInstance();
+                streamEventConverter.convertComplexEvent(aComplexEvent, newEvent);
+                outputEventChunk.add(newEvent);
                 aComplexEvent = aComplexEvent.getNext();
             }
             send(outputEventChunk.getFirst());
         } else {
             if (complexEvent.getNext() == null) {
                 for (PartitionExecutor partitionExecutor : partitionExecutors) {
-                    StreamEvent borrowedEvent = streamEventFactory.newInstance();
-                    ;
-                    streamEventConverter.convertComplexEvent(complexEvent, borrowedEvent);
-                    String key = partitionExecutor.execute(borrowedEvent);
-                    send(key, borrowedEvent);
+                    StreamEvent newEvent = streamEventFactory.newInstance();
+                    streamEventConverter.convertComplexEvent(complexEvent, newEvent);
+                    String key = partitionExecutor.execute(newEvent);
+                    send(key, newEvent);
                 }
             } else {
                 ComplexEventChunk<ComplexEvent> complexEventChunk = new ComplexEventChunk<ComplexEvent>(false);
@@ -108,12 +106,12 @@ public void receive(ComplexEvent complexEvent) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent aEvent = complexEventChunk.next();
                     complexEventChunk.remove();
-                    StreamEvent borrowedEvent = streamEventFactory.newInstance();
+                    StreamEvent newEvent = streamEventFactory.newInstance();
                     ;
-                    streamEventConverter.convertComplexEvent(aEvent, borrowedEvent);
+                    streamEventConverter.convertComplexEvent(aEvent, newEvent);
                     boolean currentEventMatchedPrevPartitionExecutor = false;
                     for (PartitionExecutor partitionExecutor : partitionExecutors) {
-                        String key = partitionExecutor.execute(borrowedEvent);
+                        String key = partitionExecutor.execute(newEvent);
                         if (key != null) {
                             if (currentKey == null) {
                                 currentKey = key;
@@ -135,7 +133,7 @@ public void receive(ComplexEvent complexEvent) {
                                 }
                             }
                             if (!currentEventMatchedPrevPartitionExecutor) {
-                                outputEventChunk.add(borrowedEvent);
+                                outputEventChunk.add(newEvent);
                             }
                             currentEventMatchedPrevPartitionExecutor = true;
                         }
@@ -150,29 +148,29 @@ public void receive(ComplexEvent complexEvent) {
 
     @Override
     public void receive(Event event) {
-        StreamEvent borrowedEvent = streamEventFactory.newInstance();
+        StreamEvent newEvent = streamEventFactory.newInstance();
         ;
-        streamEventConverter.convertEvent(event, borrowedEvent);
+        streamEventConverter.convertEvent(event, newEvent);
         for (PartitionExecutor partitionExecutor : partitionExecutors) {
-            String key = partitionExecutor.execute(borrowedEvent);
-            send(key, borrowedEvent);
+            String key = partitionExecutor.execute(newEvent);
+            send(key, newEvent);
         }
         if (partitionExecutors.size() == 0) {
-            send(borrowedEvent);
+            send(newEvent);
         }
     }
 
     @Override
     public void receive(long timestamp, Object[] data) {
-        StreamEvent borrowedEvent = streamEventFactory.newInstance();
+        StreamEvent newEvent = streamEventFactory.newInstance();
         ;
-        streamEventConverter.convertData(timestamp, data, borrowedEvent);
+        streamEventConverter.convertData(timestamp, data, newEvent);
         if (partitionExecutors.size() == 0) {
-            send(borrowedEvent);
+            send(newEvent);
         } else {
             for (PartitionExecutor partitionExecutor : partitionExecutors) {
-                String key = partitionExecutor.execute(borrowedEvent);
-                send(key, borrowedEvent);
+                String key = partitionExecutor.execute(newEvent);
+                send(key, newEvent);
             }
         }
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/DeleteStoreQueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/DeleteStoreQueryRuntime.java
index 93ce48157a..430c446fb9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/DeleteStoreQueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/DeleteStoreQueryRuntime.java
@@ -52,7 +52,7 @@ private ComplexEventChunk<ComplexEvent> generateResetComplexEventChunk(MetaStrea
                 metaStreamEvent.getOnAfterWindowData().size(), metaStreamEvent.getOutputData().size());
         streamEvent.setType(ComplexEvent.Type.RESET);
 
-        StateEvent stateEvent = stateEventPool.borrowEvent();
+        StateEvent stateEvent = stateEventFactory.newInstance();
         stateEvent.addEvent(0, streamEvent);
         stateEvent.setType(ComplexEvent.Type.RESET);
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/FindStoreQueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/FindStoreQueryRuntime.java
index 1782c6cc73..6ce681e054 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/FindStoreQueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/FindStoreQueryRuntime.java
@@ -133,7 +133,7 @@ private ComplexEventChunk<ComplexEvent> generateResetComplexEventChunk(MetaStrea
                 metaStreamEvent.getOnAfterWindowData().size(), metaStreamEvent.getOutputData().size());
         streamEvent.setType(ComplexEvent.Type.RESET);
 
-        StateEvent stateEvent = stateEventPool.borrowEvent();
+        StateEvent stateEvent = stateEventFactory.newInstance();
         if (eventType == MetaStreamEvent.EventType.AGGREGATE) {
             stateEvent.addEvent(1, streamEvent);
         } else {
@@ -154,7 +154,7 @@ private Event[] executeSelector(StreamEvent streamEvents, MetaStreamEvent.EventT
             streamEvents = streamEvents.getNext();
             streamEvent.setNext(null);
 
-            StateEvent stateEvent = stateEventPool.borrowEvent();
+            StateEvent stateEvent = stateEventFactory.newInstance();
             if (eventType == MetaStreamEvent.EventType.AGGREGATE) {
                 stateEvent.addEvent(1, streamEvent);
             } else {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/InsertStoreQueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/InsertStoreQueryRuntime.java
index cb517a7711..4791b36fb9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/InsertStoreQueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/InsertStoreQueryRuntime.java
@@ -52,7 +52,7 @@ private ComplexEventChunk<ComplexEvent> generateResetComplexEventChunk(MetaStrea
                 metaStreamEvent.getOnAfterWindowData().size(), metaStreamEvent.getOutputData().size());
         streamEvent.setType(ComplexEvent.Type.RESET);
 
-        StateEvent stateEvent = stateEventPool.borrowEvent();
+        StateEvent stateEvent = stateEventFactory.newInstance();
         stateEvent.addEvent(0, streamEvent);
         stateEvent.setType(ComplexEvent.Type.RESET);
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/StoreQueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/StoreQueryRuntime.java
index 8c361386ee..da9b90c2fa 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/StoreQueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/StoreQueryRuntime.java
@@ -20,7 +20,7 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.state.StateEvent;
-import io.siddhi.core.event.state.StateEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.exception.StoreQueryRuntimeException;
@@ -37,7 +37,7 @@ public abstract class StoreQueryRuntime {
     String queryName;
     MetaStreamEvent.EventType eventType;
     QuerySelector selector;
-    StateEventPool stateEventPool;
+    StateEventFactory stateEventFactory;
     MetaStreamEvent metaStreamEvent;
     Attribute[] outputAttributes;
 
@@ -71,10 +71,10 @@ public Event[] execute() {
     /**
      * This method sets a state event pool for store query runtime.
      *
-     * @param stateEventPool stateEventPool for the store query runtime
+     * @param stateEventFactory stateEventFactory for the store query runtime
      */
-    public void setStateEventPool(StateEventPool stateEventPool) {
-        this.stateEventPool = stateEventPool;
+    public void setStateEventFactory(StateEventFactory stateEventFactory) {
+        this.stateEventFactory = stateEventFactory;
     }
 
     /**
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/UpdateOrInsertStoreQueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/UpdateOrInsertStoreQueryRuntime.java
index cd2a627005..57b68f2c32 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/UpdateOrInsertStoreQueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/UpdateOrInsertStoreQueryRuntime.java
@@ -52,7 +52,7 @@ private ComplexEventChunk<ComplexEvent> generateResetComplexEventChunk(MetaStrea
                 metaStreamEvent.getOnAfterWindowData().size(), metaStreamEvent.getOutputData().size());
         streamEvent.setType(ComplexEvent.Type.RESET);
 
-        StateEvent stateEvent = stateEventPool.borrowEvent();
+        StateEvent stateEvent = stateEventFactory.newInstance();
         stateEvent.addEvent(0, streamEvent);
         stateEvent.setType(ComplexEvent.Type.RESET);
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/UpdateStoreQueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/UpdateStoreQueryRuntime.java
index 62c0ec918d..249406ec57 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/UpdateStoreQueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/UpdateStoreQueryRuntime.java
@@ -52,7 +52,7 @@ private ComplexEventChunk<ComplexEvent> generateResetComplexEventChunk(MetaStrea
                 metaStreamEvent.getOnAfterWindowData().size(), metaStreamEvent.getOutputData().size());
         streamEvent.setType(ComplexEvent.Type.RESET);
 
-        StateEvent stateEvent = stateEventPool.borrowEvent();
+        StateEvent stateEvent = stateEventFactory.newInstance();
         stateEvent.addEvent(0, streamEvent);
         stateEvent.setType(ComplexEvent.Type.RESET);
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
index 1d031d06f3..4c69c7c434 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/MultiProcessStreamReceiver.java
@@ -23,7 +23,7 @@
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.event.stream.converter.StreamEventConverterFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
@@ -45,7 +45,7 @@ public class MultiProcessStreamReceiver extends ProcessStreamReceiver {
     private final Object patternSyncObject;
     protected OutputRateLimiter outputRateLimiter;
     private MetaStreamEvent[] metaStreamEvents;
-    private StreamEventPool[] streamEventPools;
+    private StreamEventFactory[] streamEventFactorys;
     private StreamEventConverter[] streamEventConverters;
 
 
@@ -54,7 +54,7 @@ public MultiProcessStreamReceiver(String streamId, int processCount,
         super(streamId, siddhiQueryContext);
         nextProcessors = new Processor[processCount];
         metaStreamEvents = new MetaStreamEvent[processCount];
-        streamEventPools = new StreamEventPool[processCount];
+        streamEventFactorys = new StreamEventFactory[processCount];
         streamEventConverters = new StreamEventConverter[processCount];
         eventSequence = new int[processCount];
         this.patternSyncObject = patternSyncObject;
@@ -67,7 +67,7 @@ public static ThreadLocal<ReturnEventHolder> getMultiProcessReturn() {
         return multiProcessReturn;
     }
 
-    private void process(int eventSequence, StreamEvent borrowedEvent) {
+    private void process(int eventSequence, StreamEvent newEvent) {
         if (lockWrapper != null) {
             lockWrapper.lock();
         }
@@ -76,12 +76,12 @@ private void process(int eventSequence, StreamEvent borrowedEvent) {
             if (latencyTracker != null) {
                 try {
                     latencyTracker.markIn();
-                    processAndClear(eventSequence, borrowedEvent);
+                    processAndClear(eventSequence, newEvent);
                 } finally {
                     latencyTracker.markOut();
                 }
             } else {
-                processAndClear(eventSequence, borrowedEvent);
+                processAndClear(eventSequence, newEvent);
             }
         } finally {
             if (lockWrapper != null) {
@@ -101,10 +101,10 @@ public void receive(ComplexEvent complexEvent) {
                     stabilizeStates();
                     for (int anEventSequence : eventSequence) {
                         StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                        StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                        StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                        aStreamEventConverter.convertComplexEvent(aComplexEvent, borrowedEvent);
-                        process(anEventSequence, borrowedEvent);
+                        StreamEventFactory aStreamEventFactory = streamEventFactorys[anEventSequence];
+                        StreamEvent newEvent = aStreamEventFactory.newInstance();
+                        aStreamEventConverter.convertComplexEvent(aComplexEvent, newEvent);
+                        process(anEventSequence, newEvent);
                         if (multiProcessReturn.get() != null &&
                                 multiProcessReturn.get().complexEventChunk != null) {
                             returnEventHolderList.add(multiProcessReturn.get());
@@ -133,10 +133,10 @@ public void receive(Event event) {
                 stabilizeStates();
                 for (int anEventSequence : eventSequence) {
                     StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                    StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                    StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                    aStreamEventConverter.convertEvent(event, borrowedEvent);
-                    process(anEventSequence, borrowedEvent);
+                    StreamEventFactory aStreamEventFactory = streamEventFactorys[anEventSequence];
+                    StreamEvent newEvent = aStreamEventFactory.newInstance();
+                    aStreamEventConverter.convertEvent(event, newEvent);
+                    process(anEventSequence, newEvent);
                     if (multiProcessReturn.get() != null &&
                             multiProcessReturn.get().complexEventChunk != null) {
                         returnEventHolderList.add(multiProcessReturn.get());
@@ -162,10 +162,10 @@ public void receive(Event[] events) {
                     stabilizeStates();
                     for (int anEventSequence : eventSequence) {
                         StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                        StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                        StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                        aStreamEventConverter.convertEvent(event, borrowedEvent);
-                        process(anEventSequence, borrowedEvent);
+                        StreamEventFactory aStreamEventFactory = streamEventFactorys[anEventSequence];
+                        StreamEvent newEvent = aStreamEventFactory.newInstance();
+                        aStreamEventConverter.convertEvent(event, newEvent);
+                        process(anEventSequence, newEvent);
                         if (multiProcessReturn.get() != null &&
                                 multiProcessReturn.get().complexEventChunk != null) {
                             returnEventHolderList.add(multiProcessReturn.get());
@@ -192,10 +192,10 @@ public void receive(List<Event> events) {
                     stabilizeStates();
                     for (int anEventSequence : eventSequence) {
                         StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                        StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                        StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                        aStreamEventConverter.convertEvent(event, borrowedEvent);
-                        process(anEventSequence, borrowedEvent);
+                        StreamEventFactory aStreamEventFactory = streamEventFactorys[anEventSequence];
+                        StreamEvent newEvent = aStreamEventFactory.newInstance();
+                        aStreamEventConverter.convertEvent(event, newEvent);
+                        process(anEventSequence, newEvent);
                         if (multiProcessReturn.get() != null &&
                                 multiProcessReturn.get().complexEventChunk != null) {
                             returnEventHolderList.add(multiProcessReturn.get());
@@ -221,10 +221,10 @@ public void receive(long timestamp, Object[] data) {
                 stabilizeStates();
                 for (int anEventSequence : eventSequence) {
                     StreamEventConverter aStreamEventConverter = streamEventConverters[anEventSequence];
-                    StreamEventPool aStreamEventPool = streamEventPools[anEventSequence];
-                    StreamEvent borrowedEvent = aStreamEventPool.borrowEvent();
-                    aStreamEventConverter.convertData(timestamp, data, borrowedEvent);
-                    process(anEventSequence, borrowedEvent);
+                    StreamEventFactory aStreamEventFactory = streamEventFactorys[anEventSequence];
+                    StreamEvent newEvent = aStreamEventFactory.newInstance();
+                    aStreamEventConverter.convertData(timestamp, data, newEvent);
+                    process(anEventSequence, newEvent);
                     if (multiProcessReturn.get() != null &&
                             multiProcessReturn.get().complexEventChunk != null) {
                         returnEventHolderList.add(multiProcessReturn.get());
@@ -276,11 +276,11 @@ public boolean toStream() {
                 metaStreamEvents[0].getEventType() == MetaStreamEvent.EventType.WINDOW;
     }
 
-    public void setStreamEventPool(StreamEventPool streamEventPool) {
-        for (int i = 0, nextLength = streamEventPools.length; i < nextLength; i++) {
-            StreamEventPool eventPool = streamEventPools[i];
+    public void setStreamEventFactory(StreamEventFactory streamEventFactory) {
+        for (int i = 0, nextLength = streamEventFactorys.length; i < nextLength; i++) {
+            StreamEventFactory eventPool = streamEventFactorys[i];
             if (eventPool == null) {
-                streamEventPools[i] = streamEventPool;
+                streamEventFactorys[i] = streamEventFactory;
                 break;
             }
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/ProcessStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/ProcessStreamReceiver.java
index 078248aae0..161aedf937 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/ProcessStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/ProcessStreamReceiver.java
@@ -24,7 +24,7 @@
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.event.stream.converter.StreamEventConverterFactory;
 import io.siddhi.core.query.input.stream.state.PreStateProcessor;
@@ -51,7 +51,7 @@ public class ProcessStreamReceiver implements StreamJunction.Receiver {
     protected boolean batchProcessingAllowed;
     private StreamEventConverter streamEventConverter;
     private MetaStreamEvent metaStreamEvent;
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
     private SiddhiDebugger siddhiDebugger;
 
     public ProcessStreamReceiver(String streamId,
@@ -98,12 +98,12 @@ public void receive(ComplexEvent complexEvents) {
             siddhiDebugger.checkBreakPoint(siddhiQueryContext.getName(),
                     SiddhiDebugger.QueryTerminal.IN, complexEvents);
         }
-        StreamEvent firstEvent = streamEventPool.borrowEvent();
+        StreamEvent firstEvent = streamEventFactory.newInstance();
         streamEventConverter.convertComplexEvent(complexEvents, firstEvent);
         StreamEvent currentEvent = firstEvent;
         complexEvents = complexEvents.getNext();
         while (complexEvents != null) {
-            StreamEvent nextEvent = streamEventPool.borrowEvent();
+            StreamEvent nextEvent = streamEventFactory.newInstance();
             streamEventConverter.convertComplexEvent(complexEvents, nextEvent);
             currentEvent.setNext(nextEvent);
             currentEvent = nextEvent;
@@ -115,23 +115,23 @@ public void receive(ComplexEvent complexEvents) {
     @Override
     public void receive(Event event) {
         if (event != null) {
-            StreamEvent borrowedEvent = streamEventPool.borrowEvent();
-            streamEventConverter.convertEvent(event, borrowedEvent);
+            StreamEvent newEvent = streamEventFactory.newInstance();
+            streamEventConverter.convertEvent(event, newEvent);
             if (siddhiDebugger != null) {
                 siddhiDebugger.checkBreakPoint(siddhiQueryContext.getName(),
-                        SiddhiDebugger.QueryTerminal.IN, borrowedEvent);
+                        SiddhiDebugger.QueryTerminal.IN, newEvent);
             }
-            process(new ComplexEventChunk<StreamEvent>(borrowedEvent, borrowedEvent, this.batchProcessingAllowed));
+            process(new ComplexEventChunk<StreamEvent>(newEvent, newEvent, this.batchProcessingAllowed));
         }
     }
 
     @Override
     public void receive(Event[] events) {
-        StreamEvent firstEvent = streamEventPool.borrowEvent();
+        StreamEvent firstEvent = streamEventFactory.newInstance();
         streamEventConverter.convertEvent(events[0], firstEvent);
         StreamEvent currentEvent = firstEvent;
         for (int i = 1, eventsLength = events.length; i < eventsLength; i++) {
-            StreamEvent nextEvent = streamEventPool.borrowEvent();
+            StreamEvent nextEvent = streamEventFactory.newInstance();
             streamEventConverter.convertEvent(events[i], nextEvent);
             currentEvent.setNext(nextEvent);
             currentEvent = nextEvent;
@@ -147,7 +147,7 @@ public void receive(List<Event> events) {
         StreamEvent firstEvent = null;
         StreamEvent currentEvent = null;
         for (Event event : events) {
-            StreamEvent nextEvent = streamEventPool.borrowEvent();
+            StreamEvent nextEvent = streamEventFactory.newInstance();
             streamEventConverter.convertEvent(event, nextEvent);
             if (firstEvent == null) {
                 firstEvent = nextEvent;
@@ -165,14 +165,14 @@ public void receive(List<Event> events) {
 
     @Override
     public void receive(long timestamp, Object[] data) {
-        StreamEvent borrowedEvent = streamEventPool.borrowEvent();
-        streamEventConverter.convertData(timestamp, data, borrowedEvent);
+        StreamEvent newEvent = streamEventFactory.newInstance();
+        streamEventConverter.convertData(timestamp, data, newEvent);
         // Send to debugger
         if (siddhiDebugger != null) {
             siddhiDebugger.checkBreakPoint(siddhiQueryContext.getName(),
-                    SiddhiDebugger.QueryTerminal.IN, borrowedEvent);
+                    SiddhiDebugger.QueryTerminal.IN, newEvent);
         }
-        process(new ComplexEventChunk<StreamEvent>(borrowedEvent, borrowedEvent, this.batchProcessingAllowed));
+        process(new ComplexEventChunk<StreamEvent>(newEvent, newEvent, this.batchProcessingAllowed));
     }
 
     protected void processAndClear(ComplexEventChunk<StreamEvent> streamEventChunk) {
@@ -197,8 +197,8 @@ public void setNext(Processor next) {
         this.next = next;
     }
 
-    public void setStreamEventPool(StreamEventPool streamEventPool) {
-        this.streamEventPool = streamEventPool;
+    public void setStreamEventFactory(StreamEventFactory streamEventFactory) {
+        this.streamEventFactory = streamEventFactory;
     }
 
     public void setLockWrapper(LockWrapper lockWrapper) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinProcessor.java
index b8943f9fb0..f1ce8555bf 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/join/JoinProcessor.java
@@ -20,7 +20,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
-import io.siddhi.core.event.state.StateEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.query.processor.stream.window.FindableProcessor;
@@ -39,7 +39,7 @@ public class JoinProcessor implements Processor {
     private boolean outerJoinProcessor = false;
     private int matchingStreamIndex;
     private boolean preJoinProcessor;
-    private StateEventPool stateEventPool;
+    private StateEventFactory stateEventFactory;
     private CompiledCondition compiledCondition;
     private FindableProcessor findableProcessor;
     private Processor nextProcessor;
@@ -178,8 +178,8 @@ public void setTrigger(boolean trigger) {
         this.trigger = trigger;
     }
 
-    public void setStateEventPool(StateEventPool stateEventPool) {
-        this.stateEventPool = stateEventPool;
+    public void setStateEventFactory(StateEventFactory stateEventFactory) {
+        this.stateEventFactory = stateEventFactory;
     }
 
     /**
@@ -191,7 +191,7 @@ public void setStateEventPool(StateEventPool stateEventPool) {
      * @return StateEvent state event
      */
     public StateEvent joinEventBuilder(StreamEvent leftStream, StreamEvent rightStream, ComplexEvent.Type type) {
-        StateEvent returnEvent = stateEventPool.borrowEvent();
+        StateEvent returnEvent = stateEventFactory.newInstance();
         returnEvent.setEvent(0, leftStream);
         returnEvent.setEvent(1, rightStream);
         returnEvent.setType(type);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
index ae0e11795c..4c7fa4e4be 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
@@ -133,7 +133,7 @@ public void process(ComplexEventChunk complexEventChunk) {
                             state.getNewAndEveryStateEventList().isEmpty() &&
                             state.getPendingStateEventList().isEmpty()) {
 
-                        StateEvent stateEvent = stateEventPool.borrowEvent();
+                        StateEvent stateEvent = stateEventFactory.newInstance();
                         addState(stateEvent);
                     } else if (stateType == StateInputStream.Type.SEQUENCE &&
                             !state.getNewAndEveryStateEventList().isEmpty()) {
@@ -158,7 +158,7 @@ public void process(ComplexEventChunk complexEventChunk) {
                             if (logicalType == LogicalStateElement.Type.OR && stateEvent.getStreamEvent
                                     (partnerStatePreProcessor.getStateId()) == null) {
                                 // OR Partner not received
-                                stateEvent.addEvent(stateId, streamEventPool.borrowEvent());
+                                stateEvent.addEvent(stateId, streamEventFactory.newInstance());
                                 retEventChunk.add(stateEvent);
                             } else if (logicalType == LogicalStateElement.Type.AND && stateEvent.getStreamEvent
                                     (partnerStatePreProcessor.getStateId()) != null) {
@@ -168,7 +168,7 @@ public void process(ComplexEventChunk complexEventChunk) {
                                     (partnerStatePreProcessor.getStateId()) == null) {
                                 // AND partner didn't receive
                                 // Let the partner to process or not
-                                stateEvent.addEvent(stateId, streamEventPool.borrowEvent());
+                                stateEvent.addEvent(stateId, streamEventFactory.newInstance());
                             }
                         }
                     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
index cbea237a7d..0550f6998b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
@@ -165,7 +165,7 @@ public void process(ComplexEventChunk complexEventChunk) {
 
                 if (initialize) {
                     // This is the first processor and no events received so far
-                    StateEvent stateEvent = stateEventPool.borrowEvent();
+                    StateEvent stateEvent = stateEventFactory.newInstance();
                     addState(stateEvent);
                 } else if (stateType == StateInputStream.Type.SEQUENCE &&
                         !state.getNewAndEveryStateEventList().isEmpty()) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPreStateProcessor.java
index f362d0c4fa..79a522e8d8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StreamPreStateProcessor.java
@@ -21,10 +21,10 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.state.StateEventCloner;
-import io.siddhi.core.event.state.StateEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.processor.Processor;
 import io.siddhi.core.util.SiddhiConstants;
 import io.siddhi.core.util.snapshot.state.State;
@@ -55,10 +55,10 @@ public class StreamPreStateProcessor implements PreStateProcessor {
 
     protected ReentrantLock lock = new ReentrantLock();
 
-    protected StateEventPool stateEventPool;
+    protected StateEventFactory stateEventFactory;
     protected StreamEventCloner streamEventCloner;
     protected StateEventCloner stateEventCloner;
-    protected StreamEventPool streamEventPool;
+    protected StreamEventFactory streamEventFactory;
     protected SiddhiQueryContext siddhiQueryContext;
     protected StateHolder<StreamPreState> stateHolder;
 
@@ -161,7 +161,7 @@ public void init() {
                             instanceof AbsentPreStateProcessor))) {
                 // For 'every' sequence, the 'thisStatePostProcessor.nextEveryStatePreProcessor != null'
                 // check is not enough
-                StateEvent stateEvent = stateEventPool.borrowEvent();
+                StateEvent stateEvent = stateEventFactory.newInstance();
                 addState(stateEvent);
                 state.initialized = true;
             }
@@ -241,12 +241,12 @@ public void setStartState(boolean isStartState) {
         this.isStartState = isStartState;
     }
 
-    public void setStateEventPool(StateEventPool stateEventPool) {
-        this.stateEventPool = stateEventPool;
+    public void setStateEventFactory(StateEventFactory stateEventFactory) {
+        this.stateEventFactory = stateEventFactory;
     }
 
-    public void setStreamEventPool(StreamEventPool streamEventPool) {
-        this.streamEventPool = streamEventPool;
+    public void setStreamEventFactory(StreamEventFactory streamEventFactory) {
+        this.streamEventFactory = streamEventFactory;
     }
 
     public void setStreamEventCloner(StreamEventCloner streamEventCloner) {
@@ -382,20 +382,6 @@ class StreamPreState extends State {
         private boolean initialized;
         private boolean started;
 
-//        public StreamPreState() {
-//            if (initAtStartup && isStartState &&
-//                    (!initialized || thisStatePostProcessor.nextEveryStatePreProcessor != null ||
-//                            (stateType == StateInputStream.Type.SEQUENCE &&
-//                                    thisStatePostProcessor.nextStatePreProcessor instanceof
-//                                                      AbsentPreStateProcessor))) {
-//                // For 'every' sequence, the 'thisStatePostProcessor.nextEveryStatePreProcessor != null'
-//                // check is not enough
-//                StateEvent stateEvent = stateEventPool.borrowEvent();
-//                addState(stateEvent, this);
-//                initialized = true;
-//            }
-//        }
-
         @Override
         public boolean canDestroy() {
             return currentStateEventChunk.getFirst() == null &&
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/DeleteTableCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/DeleteTableCallback.java
index 2073ad83e6..ce7f8e2d83 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/DeleteTableCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/DeleteTableCallback.java
@@ -21,8 +21,8 @@
 import io.siddhi.core.debugger.SiddhiDebugger;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
-import io.siddhi.core.event.state.StateEventPool;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.table.Table;
 import io.siddhi.core.util.collection.operator.CompiledCondition;
@@ -37,21 +37,21 @@ public class DeleteTableCallback extends OutputCallback {
     private Table table;
     private CompiledCondition compiledCondition;
     private boolean convertToStreamEvent;
-    private StateEventPool stateEventPool;
-    private StreamEventPool streamEventPool;
+    private StateEventFactory stateEventFactory;
+    private StreamEventFactory streamEventFactory;
     private StreamEventConverter streamEventConverter;
 
     public DeleteTableCallback(Table table, CompiledCondition compiledCondition, int matchingStreamIndex,
-                               boolean convertToStreamEvent, StateEventPool stateEventPool,
-                               StreamEventPool streamEventPool, StreamEventConverter streamEventConverter,
+                               boolean convertToStreamEvent, StateEventFactory stateEventFactory,
+                               StreamEventFactory streamEventFactory, StreamEventConverter streamEventConverter,
                                String queryName) {
         super(queryName);
         this.matchingStreamIndex = matchingStreamIndex;
         this.table = table;
         this.compiledCondition = compiledCondition;
         this.convertToStreamEvent = convertToStreamEvent;
-        this.stateEventPool = stateEventPool;
-        this.streamEventPool = streamEventPool;
+        this.stateEventFactory = stateEventFactory;
+        this.streamEventFactory = streamEventFactory;
         this.streamEventConverter = streamEventConverter;
     }
 
@@ -64,8 +64,8 @@ public void send(ComplexEventChunk deletingEventChunk, int noOfEvents) {
         deletingEventChunk.reset();
         if (deletingEventChunk.hasNext()) {
             ComplexEventChunk<StateEvent> deletingStateEventChunk = constructMatchingStateEventChunk(
-                    deletingEventChunk, convertToStreamEvent, stateEventPool, matchingStreamIndex, streamEventPool,
-                    streamEventConverter);
+                    deletingEventChunk, convertToStreamEvent, stateEventFactory, matchingStreamIndex,
+                    streamEventFactory, streamEventConverter);
             table.deleteEvents(deletingStateEventChunk, compiledCondition, noOfEvents);
         }
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoTableCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoTableCallback.java
index 5e499b4331..ec0856c5b7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoTableCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/InsertIntoTableCallback.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.table.Table;
 import io.siddhi.query.api.definition.StreamDefinition;
@@ -35,17 +35,17 @@ public class InsertIntoTableCallback extends OutputCallback {
     private Table table;
     private StreamDefinition outputStreamDefinition;
     private boolean convertToStreamEvent;
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
     private StreamEventConverter streamEventConverter;
 
     public InsertIntoTableCallback(Table table, StreamDefinition outputStreamDefinition,
-                                   boolean convertToStreamEvent, StreamEventPool streamEventPool,
+                                   boolean convertToStreamEvent, StreamEventFactory streamEventFactory,
                                    StreamEventConverter streamEventConverter, String queryName) {
         super(queryName);
         this.table = table;
         this.outputStreamDefinition = outputStreamDefinition;
         this.convertToStreamEvent = convertToStreamEvent;
-        this.streamEventPool = streamEventPool;
+        this.streamEventFactory = streamEventFactory;
         this.streamEventConverter = streamEventConverter;
     }
 
@@ -61,7 +61,7 @@ public void send(ComplexEventChunk complexEventChunk, int noOfEvents) {
             complexEventChunk.reset();
             while (complexEventChunk.hasNext()) {
                 ComplexEvent complexEvent = complexEventChunk.next();
-                StreamEvent borrowEvent = streamEventPool.borrowEvent();
+                StreamEvent borrowEvent = streamEventFactory.newInstance();
                 streamEventConverter.convertData(
                         complexEvent.getTimestamp(),
                         complexEvent.getOutputData(),
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/OutputCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/OutputCallback.java
index b755f9bd41..49c1a2d462 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/OutputCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/OutputCallback.java
@@ -22,9 +22,9 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
-import io.siddhi.core.event.state.StateEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 
 /**
@@ -54,16 +54,18 @@ String getQueryName() {
     }
 
     protected ComplexEventChunk<StateEvent> constructMatchingStateEventChunk(
-            ComplexEventChunk matchingComplexEventChunk, boolean convertToStreamEvent, StateEventPool stateEventPool,
-            int matchingStreamIndex, StreamEventPool streamEventPool, StreamEventConverter streamEventConverter) {
+            ComplexEventChunk matchingComplexEventChunk, boolean convertToStreamEvent,
+            StateEventFactory stateEventFactory,
+            int matchingStreamIndex, StreamEventFactory streamEventFactory,
+            StreamEventConverter streamEventConverter) {
         ComplexEventChunk<StateEvent> stateEventChunk = new ComplexEventChunk<StateEvent>(
                 matchingComplexEventChunk.isBatch());
         while (matchingComplexEventChunk.hasNext()) {
             ComplexEvent matchingComplexEvent = matchingComplexEventChunk.next();
             matchingComplexEventChunk.remove();
-            StateEvent stateEvent = stateEventPool.borrowEvent();
+            StateEvent stateEvent = stateEventFactory.newInstance();
             if (convertToStreamEvent) {
-                StreamEvent borrowEvent = streamEventPool.borrowEvent();
+                StreamEvent borrowEvent = streamEventFactory.newInstance();
                 streamEventConverter.convertData(
                         matchingComplexEvent.getTimestamp(),
                         matchingComplexEvent.getOutputData(),
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateOrInsertTableCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateOrInsertTableCallback.java
index 5d9edc4293..b8a95fe8e9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateOrInsertTableCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateOrInsertTableCallback.java
@@ -21,8 +21,8 @@
 import io.siddhi.core.debugger.SiddhiDebugger;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
-import io.siddhi.core.event.state.StateEventPool;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.table.CompiledUpdateSet;
 import io.siddhi.core.table.Table;
@@ -41,14 +41,14 @@ public class UpdateOrInsertTableCallback extends OutputCallback {
     private CompiledCondition compiledCondition;
     private CompiledUpdateSet compiledUpdateSet;
     private boolean convertToStreamEvent;
-    private StateEventPool stateEventPool;
-    private StreamEventPool streamEventPool;
+    private StateEventFactory stateEventFactory;
+    private StreamEventFactory streamEventFactory;
     private StreamEventConverter streamEventConverter;
 
     public UpdateOrInsertTableCallback(Table table, CompiledCondition compiledCondition,
                                        CompiledUpdateSet compiledUpdateSet,
                                        int matchingStreamIndex, boolean convertToStreamEvent,
-                                       StateEventPool stateEventPool, StreamEventPool streamEventPool,
+                                       StateEventFactory stateEventFactory, StreamEventFactory streamEventFactory,
                                        StreamEventConverter streamEventConverter, String queryName) {
         super(queryName);
         this.matchingStreamIndex = matchingStreamIndex;
@@ -56,8 +56,8 @@ public UpdateOrInsertTableCallback(Table table, CompiledCondition compiledCondit
         this.compiledCondition = compiledCondition;
         this.compiledUpdateSet = compiledUpdateSet;
         this.convertToStreamEvent = convertToStreamEvent;
-        this.stateEventPool = stateEventPool;
-        this.streamEventPool = streamEventPool;
+        this.stateEventFactory = stateEventFactory;
+        this.streamEventFactory = streamEventFactory;
         this.streamEventConverter = streamEventConverter;
         this.addingStreamEventExtractor = new AddingStreamEventExtractor(matchingStreamIndex);
     }
@@ -71,10 +71,10 @@ public void send(ComplexEventChunk updateOrAddEventChunk, int noOfEvents) {
         updateOrAddEventChunk.reset();
         if (updateOrAddEventChunk.hasNext()) {
             ComplexEventChunk<StateEvent> updateOrAddStateEventChunk = constructMatchingStateEventChunk
-                    (updateOrAddEventChunk, convertToStreamEvent, stateEventPool,
-                            matchingStreamIndex, streamEventPool, streamEventConverter);
-            constructMatchingStateEventChunk(updateOrAddEventChunk, convertToStreamEvent, stateEventPool,
-                    matchingStreamIndex, streamEventPool, streamEventConverter);
+                    (updateOrAddEventChunk, convertToStreamEvent, stateEventFactory,
+                            matchingStreamIndex, streamEventFactory, streamEventConverter);
+            constructMatchingStateEventChunk(updateOrAddEventChunk, convertToStreamEvent, stateEventFactory,
+                    matchingStreamIndex, streamEventFactory, streamEventConverter);
             table.updateOrAddEvents(updateOrAddStateEventChunk, compiledCondition, compiledUpdateSet,
                     addingStreamEventExtractor, noOfEvents);
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateTableCallback.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateTableCallback.java
index c9f08bbc20..a52f6d4d53 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateTableCallback.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/callback/UpdateTableCallback.java
@@ -21,8 +21,8 @@
 import io.siddhi.core.debugger.SiddhiDebugger;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.state.StateEvent;
-import io.siddhi.core.event.state.StateEventPool;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.table.CompiledUpdateSet;
 import io.siddhi.core.table.Table;
@@ -39,13 +39,15 @@ public class UpdateTableCallback extends OutputCallback {
     private CompiledCondition compiledCondition;
     private CompiledUpdateSet compiledUpdateSet;
     private boolean convertToStreamEvent;
-    private StateEventPool stateEventPool;
-    private StreamEventPool streamEventPool;
+    private StateEventFactory stateEventFactory;
+    private StreamEventFactory streamEventFactory;
     private StreamEventConverter streamEventConverter;
 
-    public UpdateTableCallback(Table table, CompiledCondition compiledCondition, CompiledUpdateSet compiledUpdateSet,
-                               int matchingStreamIndex, boolean convertToStreamEvent, StateEventPool stateEventPool,
-                               StreamEventPool streamEventPool, StreamEventConverter streamEventConverter,
+    public UpdateTableCallback(Table table, CompiledCondition compiledCondition,
+                               CompiledUpdateSet compiledUpdateSet,
+                               int matchingStreamIndex, boolean convertToStreamEvent,
+                               StateEventFactory stateEventFactory, StreamEventFactory streamEventFactory,
+                               StreamEventConverter streamEventConverter,
                                String queryName) {
         super(queryName);
         this.table = table;
@@ -53,8 +55,8 @@ public UpdateTableCallback(Table table, CompiledCondition compiledCondition, Com
         this.compiledUpdateSet = compiledUpdateSet;
         this.matchingStreamIndex = matchingStreamIndex;
         this.convertToStreamEvent = convertToStreamEvent;
-        this.stateEventPool = stateEventPool;
-        this.streamEventPool = streamEventPool;
+        this.stateEventFactory = stateEventFactory;
+        this.streamEventFactory = streamEventFactory;
         this.streamEventConverter = streamEventConverter;
     }
 
@@ -66,8 +68,9 @@ public void send(ComplexEventChunk updatingEventChunk, int noOfEvents) {
         }
         updatingEventChunk.reset();
         if (updatingEventChunk.hasNext()) {
-            ComplexEventChunk<StateEvent> updatingStateEventChunk = constructMatchingStateEventChunk(updatingEventChunk,
-                    convertToStreamEvent, stateEventPool, matchingStreamIndex, streamEventPool, streamEventConverter);
+            ComplexEventChunk<StateEvent> updatingStateEventChunk = constructMatchingStateEventChunk(
+                    updatingEventChunk, convertToStreamEvent, stateEventFactory, matchingStreamIndex,
+                    streamEventFactory, streamEventConverter);
             table.updateEvents(updatingStateEventChunk, compiledCondition, compiledUpdateSet, noOfEvents);
         }
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
index a45e53e228..f75ce12129 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.State;
@@ -158,7 +158,7 @@ private void tryFlushEvents(ArrayList<ComplexEventChunk<ComplexEvent>> outputEve
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index e76514a38a..651ba9dbc4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -23,7 +23,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.State;
@@ -124,7 +124,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
index aad8d9c3d9..84a9372fc3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.State;
@@ -100,7 +100,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
index 88e02cf161..c7cde09bd7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.State;
@@ -106,7 +106,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
index 99965f7fa1..50a42663d3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.State;
@@ -100,7 +100,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
index b07c57f2e2..bb6897d52d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.util.Scheduler;
 import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.State;
@@ -127,8 +127,8 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0,
-                0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0,
+                0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
index 4fac521f8d..e2410fdd0c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
@@ -23,10 +23,10 @@
 import io.siddhi.core.event.MetaComplexEvent;
 import io.siddhi.core.event.state.MetaStateEvent;
 import io.siddhi.core.event.state.StateEventCloner;
-import io.siddhi.core.event.state.StateEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.query.selector.attribute.aggregator.AttributeAggregatorExecutor;
 import io.siddhi.core.query.selector.attribute.processor.AttributeProcessor;
@@ -116,13 +116,13 @@ public void init(int outPutAttributeSize, List<AttributeProcessor> attributeProc
 
 
         if (metaComplexEvent instanceof MetaStateEvent) {
-            StateEventPool stateEventPool = new StateEventPool((MetaStateEvent) metaComplexEvent, 5);
+            StateEventFactory stateEventFactory = new StateEventFactory((MetaStateEvent) metaComplexEvent);
             outputRateLimiter.setStateEventCloner(new StateEventCloner((MetaStateEvent) metaComplexEvent,
-                    stateEventPool));
+                    stateEventFactory));
         } else {
-            StreamEventPool streamEventPool = new StreamEventPool((MetaStreamEvent) metaComplexEvent, 5);
+            StreamEventFactory streamEventFactory = new StreamEventFactory((MetaStreamEvent) metaComplexEvent);
             outputRateLimiter.setStreamEventCloner(new StreamEventCloner((MetaStreamEvent) metaComplexEvent,
-                    streamEventPool));
+                    streamEventFactory));
         }
 
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
index 91eda4f319..46f938e48b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
@@ -20,7 +20,7 @@
 
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
@@ -101,7 +101,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
index 21189ce957..48c85d54c9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
@@ -107,7 +107,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
index c5d78bf93c..c51fc3d818 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
@@ -20,7 +20,7 @@
 
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
@@ -100,7 +100,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
index 1f014e81e1..873f4bdbc1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
@@ -106,7 +106,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
index 2e703d2448..88a52ad1df 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
@@ -20,7 +20,7 @@
 
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.util.Schedulable;
 import io.siddhi.core.util.Scheduler;
@@ -99,7 +99,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     @Override
     public void start() {
         scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventPool(new StreamEventPool(0, 0, 0, 5));
+        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
         scheduler.init(lockWrapper, siddhiQueryContext.getName());
         long currentTime = System.currentTimeMillis();
         scheduledTime = currentTime + value;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/StreamJunction.java b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/StreamJunction.java
index 537b02c18f..64cea27532 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/stream/StreamJunction.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/stream/StreamJunction.java
@@ -26,7 +26,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.FaultStreamEventConverter;
 import io.siddhi.core.exception.SiddhiAppCreationException;
 import io.siddhi.core.stream.input.InputProcessor;
@@ -93,11 +93,9 @@ public StreamJunction(StreamDefinition streamDefinition, ExecutorService executo
         this.faultStreamJunction = faultStreamJunction;
         if (faultStreamJunction != null) {
             StreamDefinition faultStreamDefinition = faultStreamJunction.getStreamDefinition();
-            StreamEventPool faultStreamEventPool = new StreamEventPool(0, 0,
-                    faultStreamDefinition.getAttributeList().size(), 5);
-            faultStreamEventPool.borrowEvent();
-            faultStreamEventConverter = new FaultStreamEventConverter(faultStreamEventPool);
-
+            StreamEventFactory faultStreamEventFactory = new StreamEventFactory(0, 0,
+                    faultStreamDefinition.getAttributeList().size());
+            faultStreamEventConverter = new FaultStreamEventConverter(faultStreamEventFactory);
         }
         try {
             Annotation asyncAnnotation = AnnotationHelper.getAnnotation(SiddhiConstants.ANNOTATION_ASYNC,
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/InMemoryTable.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/InMemoryTable.java
index a44817d80d..d34669fa1a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/InMemoryTable.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/InMemoryTable.java
@@ -24,7 +24,7 @@
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.exception.ConnectionUnavailableException;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -63,7 +63,7 @@ public class InMemoryTable extends Table {
     private StateHolder<TableState> stateHolder;
 
     @Override
-    public void init(TableDefinition tableDefinition, StreamEventPool storeEventPool,
+    public void init(TableDefinition tableDefinition, StreamEventFactory storeEventPool,
                      StreamEventCloner storeEventCloner, ConfigReader configReader, SiddhiAppContext siddhiAppContext,
                      RecordTableHandler recordTableHandler) {
         this.tableDefinition = tableDefinition;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/Table.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/Table.java
index 93eff19e89..31f930bd8e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/Table.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/Table.java
@@ -24,7 +24,7 @@
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.exception.ConnectionUnavailableException;
 import io.siddhi.core.executor.VariableExpressionExecutor;
 import io.siddhi.core.query.processor.stream.window.FindableProcessor;
@@ -80,7 +80,7 @@ public abstract class Table implements FindableProcessor, MemoryCalculable {
     private ThroughputTracker throughputTrackerUpdateOrInsert;
     private ThroughputTracker throughputTrackerContains;
 
-    public void initTable(TableDefinition tableDefinition, StreamEventPool storeEventPool,
+    public void initTable(TableDefinition tableDefinition, StreamEventFactory storeEventPool,
                           StreamEventCloner storeEventCloner,
                           ConfigReader configReader, SiddhiAppContext siddhiAppContext,
                           RecordTableHandler recordTableHandler) {
@@ -122,7 +122,7 @@ public void initTable(TableDefinition tableDefinition, StreamEventPool storeEven
         init(tableDefinition, storeEventPool, storeEventCloner, configReader, siddhiAppContext, recordTableHandler);
     }
 
-    protected abstract void init(TableDefinition tableDefinition, StreamEventPool storeEventPool,
+    protected abstract void init(TableDefinition tableDefinition, StreamEventFactory storeEventPool,
                                  StreamEventCloner storeEventCloner, ConfigReader configReader,
                                  SiddhiAppContext siddhiAppContext, RecordTableHandler recordTableHandler);
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/IndexEventHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/IndexEventHolder.java
index aaef9b2c77..779ba4c059 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/IndexEventHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/IndexEventHolder.java
@@ -23,7 +23,7 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.Operation;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.exception.OperationNotSupportedException;
 import io.siddhi.core.util.SiddhiConstants;
@@ -67,7 +67,7 @@ public class IndexEventHolder implements IndexedEventHolder, Serializable {
     private final String tableName;
     private final String siddhiAppName;
     private String primaryKeyAttributes = null;
-    private StreamEventPool tableStreamEventPool;
+    private StreamEventFactory tableStreamEventFactory;
     private StreamEventConverter eventConverter;
     private Map<String, Integer> indexMetaData;
     private Map<String, Integer> multiPrimaryKeyMetaData = new LinkedHashMap<>();
@@ -77,11 +77,11 @@ public class IndexEventHolder implements IndexedEventHolder, Serializable {
     private boolean forceFullSnapshot = true;
     private boolean isOperationLogEnabled = true;
 
-    public IndexEventHolder(StreamEventPool tableStreamEventPool, StreamEventConverter eventConverter,
+    public IndexEventHolder(StreamEventFactory tableStreamEventFactory, StreamEventConverter eventConverter,
                             PrimaryKeyReferenceHolder[] primaryKeyReferenceHolders,
                             boolean isPrimaryNumeric, Map<String, Integer> indexMetaData,
                             AbstractDefinition tableDefinition, SiddhiAppContext siddhiAppContext) {
-        this.tableStreamEventPool = tableStreamEventPool;
+        this.tableStreamEventFactory = tableStreamEventFactory;
         this.eventConverter = eventConverter;
         this.primaryKeyReferenceHolders = primaryKeyReferenceHolders;
         this.indexMetaData = indexMetaData;
@@ -157,12 +157,12 @@ public void add(ComplexEventChunk<StreamEvent> addingEventChunk) {
         addingEventChunk.reset();
         while (addingEventChunk.hasNext()) {
             ComplexEvent complexEvent = addingEventChunk.next();
-            StreamEvent streamEvent = tableStreamEventPool.borrowEvent();
+            StreamEvent streamEvent = tableStreamEventFactory.newInstance();
             eventConverter.convertComplexEvent(complexEvent, streamEvent);
             eventsCount++;
             if (isOperationLogEnabled) {
                 if (!isFullSnapshot()) {
-                    StreamEvent streamEvent2 = tableStreamEventPool.borrowEvent();
+                    StreamEvent streamEvent2 = tableStreamEventFactory.newInstance();
                     eventConverter.convertComplexEvent(complexEvent, streamEvent2);
                     operationChangeLog.add(new Operation(ADD, streamEvent2));
                 } else {
@@ -220,7 +220,7 @@ private Object constructPrimaryKey(StreamEvent streamEvent,
     public void overwrite(StreamEvent streamEvent) {
         if (isOperationLogEnabled) {
             if (!isFullSnapshot()) {
-                StreamEvent streamEvent2 = tableStreamEventPool.borrowEvent();
+                StreamEvent streamEvent2 = tableStreamEventFactory.newInstance();
                 eventConverter.convertComplexEvent(streamEvent, streamEvent2);
                 operationChangeLog.add(new Operation(OVERWRITE, streamEvent2));
             } else {
@@ -389,7 +389,7 @@ public void deleteAll(Collection<StreamEvent> storeEventSet) {
         for (StreamEvent streamEvent : storeEventSet) {
             if (isOperationLogEnabled) {
                 if (!isFullSnapshot()) {
-                    StreamEvent streamEvent2 = tableStreamEventPool.borrowEvent();
+                    StreamEvent streamEvent2 = tableStreamEventFactory.newInstance();
                     eventConverter.convertComplexEvent(streamEvent, streamEvent2);
                     operationChangeLog.add(new Operation(REMOVE, streamEvent));
                 } else {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/ListEventHolder.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/ListEventHolder.java
index 4e931f7af0..d7055b2df6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/ListEventHolder.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/holder/ListEventHolder.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
 import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
@@ -33,13 +33,13 @@
 public class ListEventHolder extends SnapshotableStreamEventQueue implements EventHolder {
 
     private static final long serialVersionUID = 4695745058501269511L;
-    private StreamEventPool tableStreamEventPool;
+    private StreamEventFactory tableStreamEventFactory;
     private StreamEventConverter eventConverter;
 
-    public ListEventHolder(StreamEventPool tableStreamEventPool, StreamEventConverter eventConverter,
+    public ListEventHolder(StreamEventFactory tableStreamEventFactory, StreamEventConverter eventConverter,
                            StreamEventClonerHolder streamEventClonerHolder) {
         super(streamEventClonerHolder);
-        this.tableStreamEventPool = tableStreamEventPool;
+        this.tableStreamEventFactory = tableStreamEventFactory;
         this.eventConverter = eventConverter;
     }
 
@@ -48,7 +48,7 @@ public void add(ComplexEventChunk<StreamEvent> addingEventChunk) {
         addingEventChunk.reset();
         while (addingEventChunk.hasNext()) {
             ComplexEvent complexEvent = addingEventChunk.next();
-            StreamEvent streamEvent = tableStreamEventPool.borrowEvent();
+            StreamEvent streamEvent = tableStreamEventFactory.newInstance();
             eventConverter.convertComplexEvent(complexEvent, streamEvent);
             this.add(streamEvent);
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractQueryableRecordTable.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractQueryableRecordTable.java
index a4989734f4..8831a59f13 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractQueryableRecordTable.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractQueryableRecordTable.java
@@ -95,7 +95,7 @@ public StreamEvent query(StateEvent matchingEvent, CompiledCondition compiledCon
         if (records != null) {
             while (records.hasNext()) {
                 Object[] record = records.next();
-                StreamEvent streamEvent = storeEventPool.borrowEvent();
+                StreamEvent streamEvent = storeEventPool.newInstance();
                 streamEvent.setOutputData(new Object[outputAttributes.length]);
                 System.arraycopy(record, 0, streamEvent.getOutputData(), 0, record.length);
                 streamEventComplexEventChunk.add(streamEvent);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractRecordTable.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractRecordTable.java
index 9091fc43a1..44262e9dfe 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractRecordTable.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/table/record/AbstractRecordTable.java
@@ -24,7 +24,7 @@
 import io.siddhi.core.event.state.StateEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.exception.ConnectionUnavailableException;
 import io.siddhi.core.executor.ExpressionExecutor;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -54,11 +54,11 @@ public abstract class AbstractRecordTable extends Table {
 
     private static final Logger log = Logger.getLogger(AbstractRecordTable.class);
 
-    protected StreamEventPool storeEventPool;
+    protected StreamEventFactory storeEventPool;
     protected RecordTableHandler recordTableHandler;
 
     @Override
-    public void init(TableDefinition tableDefinition, StreamEventPool storeEventPool,
+    public void init(TableDefinition tableDefinition, StreamEventFactory storeEventPool,
                      StreamEventCloner storeEventCloner, ConfigReader configReader, SiddhiAppContext
                              siddhiAppContext, RecordTableHandler recordTableHandler) {
         if (recordTableHandler != null) {
@@ -132,7 +132,7 @@ public StreamEvent find(CompiledCondition compiledCondition, StateEvent matching
         if (records != null) {
             while (records.hasNext()) {
                 Object[] record = records.next();
-                StreamEvent streamEvent = storeEventPool.borrowEvent();
+                StreamEvent streamEvent = storeEventPool.newInstance();
                 System.arraycopy(record, 0, streamEvent.getOutputData(), 0, record.length);
                 streamEventComplexEventChunk.add(streamEvent);
             }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
index f22683e294..0c5d227208 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
@@ -23,7 +23,7 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.util.lock.LockWrapper;
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateHolder;
@@ -53,7 +53,7 @@ public class Scheduler {
     private SiddhiQueryContext siddhiQueryContext;
     private LockWrapper lockWrapper;
     private ScheduledExecutorService scheduledExecutorService;
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
     private LatencyTracker latencyTracker;
     private StateHolder<SchedulerState> stateHolder;
 
@@ -149,9 +149,8 @@ public void schedule(long time, SchedulerState state) {
     }
 
 
-    public void setStreamEventPool(StreamEventPool streamEventPool) {
-        this.streamEventPool = streamEventPool;
-//        streamEventChunk = new ConversionStreamEventChunk((StreamEventConverter) null, streamEventPool);
+    public void setStreamEventFactory(StreamEventFactory streamEventFactory) {
+        this.streamEventFactory = streamEventFactory;
     }
 
     public void setLatencyTracker(LatencyTracker latencyTracker) {
@@ -168,7 +167,7 @@ protected void sendTimerEvents(SchedulerState state) {
         long currentTime = siddhiQueryContext.getSiddhiAppContext().getTimestampGenerator().currentTime();
         while (toNotifyTime != null && toNotifyTime - currentTime <= 0) {
             state.toNotifyQueue.poll();
-            StreamEvent timerEvent = streamEventPool.borrowEvent();
+            StreamEvent timerEvent = streamEventFactory.newInstance();
             timerEvent.setType(StreamEvent.Type.TIMER);
             timerEvent.setTimestamp(toNotifyTime);
             if (lockWrapper != null) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
index d145439d88..617ebba51c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/collection/operator/IncrementalAggregateCompileCondition.java
@@ -28,7 +28,7 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.exception.SiddhiAppRuntimeException;
 import io.siddhi.core.executor.ExpressionExecutor;
@@ -49,9 +49,9 @@
  * based on the logical conditions defined herewith.
  */
 public class IncrementalAggregateCompileCondition implements CompiledCondition {
-    private final StreamEventPool streamEventPoolForTableMeta;
+    private final StreamEventFactory streamEventFactoryForTableMeta;
     private final StreamEventCloner tableEventCloner;
-    private final StreamEventPool streamEventPoolForAggregateMeta;
+    private final StreamEventFactory streamEventFactoryForAggregateMeta;
     private final StreamEventCloner aggregateEventCloner;
     private final List<Attribute> additionalAttributes;
     private Map<TimePeriod.Duration, CompiledCondition> withinTableCompiledConditions;
@@ -76,11 +76,11 @@ public IncrementalAggregateCompileCondition(
         this.onCompiledCondition = onCompiledCondition;
         this.tableMetaStreamEvent = tableMetaStreamEvent;
 
-        this.streamEventPoolForTableMeta = new StreamEventPool(tableMetaStreamEvent, 10);
-        this.tableEventCloner = new StreamEventCloner(tableMetaStreamEvent, streamEventPoolForTableMeta);
+        this.streamEventFactoryForTableMeta = new StreamEventFactory(tableMetaStreamEvent);
+        this.tableEventCloner = new StreamEventCloner(tableMetaStreamEvent, streamEventFactoryForTableMeta);
 
-        this.streamEventPoolForAggregateMeta = new StreamEventPool(aggregateMetaSteamEvent, 10);
-        this.aggregateEventCloner = new StreamEventCloner(aggregateMetaSteamEvent, streamEventPoolForAggregateMeta);
+        this.streamEventFactoryForAggregateMeta = new StreamEventFactory(aggregateMetaSteamEvent);
+        this.aggregateEventCloner = new StreamEventCloner(aggregateMetaSteamEvent, streamEventFactoryForAggregateMeta);
         this.additionalAttributes = additionalAttributes;
         this.alteredMatchingMetaInfoHolder = alteredMatchingMetaInfoHolder;
         this.perExpressionExecutor = perExpressionExecutor;
@@ -189,12 +189,12 @@ private ComplexEventChunk<StreamEvent> createAggregateSelectionEventChunk(
             ComplexEventChunk<StreamEvent> complexEventChunkToHoldMatches,
             List<ExpressionExecutor> outputExpressionExecutors) {
         ComplexEventChunk<StreamEvent> aggregateSelectionComplexEventChunk = new ComplexEventChunk<>(true);
-        StreamEvent resetEvent = streamEventPoolForTableMeta.borrowEvent();
+        StreamEvent resetEvent = streamEventFactoryForTableMeta.newInstance();
         resetEvent.setType(ComplexEvent.Type.RESET);
 
         while (complexEventChunkToHoldMatches.hasNext()) {
             StreamEvent streamEvent = complexEventChunkToHoldMatches.next();
-            StreamEvent newStreamEvent = streamEventPoolForAggregateMeta.borrowEvent();
+            StreamEvent newStreamEvent = streamEventFactoryForAggregateMeta.newInstance();
             Object outputData[] = new Object[newStreamEvent.getOutputData().length];
             for (int i = 0; i < outputExpressionExecutors.size(); i++) {
                 outputData[i] = outputExpressionExecutors.get(i).execute(streamEvent);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
index 0227f71b9f..10daf327c2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
@@ -28,7 +28,7 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.exception.SiddhiAppCreationException;
 import io.siddhi.core.executor.ConstantExpressionExecutor;
 import io.siddhi.core.executor.ExpressionExecutor;
@@ -276,7 +276,7 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
 
             Scheduler scheduler = SchedulerParser.parse(entryValveExecutor, siddhiQueryContext);
             scheduler.init(lockWrapper, aggregatorName);
-            scheduler.setStreamEventPool(new StreamEventPool(processedMetaStreamEvent, 10));
+            scheduler.setStreamEventFactory(new StreamEventFactory(processedMetaStreamEvent));
 
             QueryParserHelper.reduceMetaComplexEvent(incomingMetaStreamEvent);
             QueryParserHelper.reduceMetaComplexEvent(processedMetaStreamEvent);
@@ -315,7 +315,7 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
                                 aggregationTables, siddhiQueryContext, aggregatorName, shouldUpdateTimestamp);
             }
             IncrementalDataPurging incrementalDataPurging = new IncrementalDataPurging();
-            incrementalDataPurging.init(aggregationDefinition, new StreamEventPool(processedMetaStreamEvent, 10)
+            incrementalDataPurging.init(aggregationDefinition, new StreamEventFactory(processedMetaStreamEvent)
                     , aggregationTables, isProcessingOnExternalTime, siddhiQueryContext);
 
             //Recreate in-memory data from tables
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/EventHolderPasser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/EventHolderPasser.java
index 3ba77fcdf8..cfa4222784 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/EventHolderPasser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/EventHolderPasser.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.ZeroStreamEventConverter;
 import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.exception.OperationNotSupportedException;
@@ -48,7 +48,7 @@
 public class EventHolderPasser {
     private static final Logger log = Logger.getLogger(EventHolderPasser.class);
 
-    public static EventHolder parse(AbstractDefinition tableDefinition, StreamEventPool tableStreamEventPool,
+    public static EventHolder parse(AbstractDefinition tableDefinition, StreamEventFactory tableStreamEventFactory,
                                     SiddhiAppContext siddhiAppContext) {
         ZeroStreamEventConverter eventConverter = new ZeroStreamEventConverter();
 
@@ -113,15 +113,15 @@ public static EventHolder parse(AbstractDefinition tableDefinition, StreamEventP
                 }
 
             }
-            return new IndexEventHolder(tableStreamEventPool, eventConverter, primaryKeyReferenceHolders, isNumeric,
+            return new IndexEventHolder(tableStreamEventFactory, eventConverter, primaryKeyReferenceHolders, isNumeric,
                     indexMetaData, tableDefinition, siddhiAppContext);
         } else {
             MetaStreamEvent metaStreamEvent = new MetaStreamEvent();
             for (Attribute attribute : tableDefinition.getAttributeList()) {
                 metaStreamEvent.addOutputData(attribute);
             }
-            StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent, tableStreamEventPool);
-            return new ListEventHolder(tableStreamEventPool, eventConverter,
+            StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent, tableStreamEventFactory);
+            return new ListEventHolder(tableStreamEventFactory, eventConverter,
                     new StreamEventClonerHolder(streamEventCloner));
         }
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
index a9c2ef2b1a..feaa1d172d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
@@ -18,9 +18,9 @@
 package io.siddhi.core.util.parser;
 
 import io.siddhi.core.config.SiddhiQueryContext;
-import io.siddhi.core.event.state.StateEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
 import io.siddhi.core.event.stream.MetaStreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.event.stream.converter.ZeroStreamEventConverter;
 import io.siddhi.core.exception.OperationNotSupportedException;
@@ -93,7 +93,7 @@ public static OutputCallback constructOutputCallback(final OutputStream outStrea
             table = tableMap.get(id);
             window = eventWindowMap.get(id);
         }
-        StreamEventPool streamEventPool = null;
+        StreamEventFactory streamEventFactory = null;
         StreamEventConverter streamEventConverter = null;
         MetaStreamEvent tableMetaStreamEvent = null;
         if (table != null) {
@@ -108,7 +108,7 @@ public static OutputCallback constructOutputCallback(final OutputStream outStrea
             matchingTableDefinition.setQueryContextEndIndex(outStream.getQueryContextEndIndex());
             tableMetaStreamEvent.addInputDefinition(matchingTableDefinition);
 
-            streamEventPool = new StreamEventPool(tableMetaStreamEvent, 10);
+            streamEventFactory = new StreamEventFactory(tableMetaStreamEvent);
             streamEventConverter = new ZeroStreamEventConverter();
         }
 
@@ -124,7 +124,7 @@ public static OutputCallback constructOutputCallback(final OutputStream outStrea
             } else if (table != null) {
                 DefinitionParserHelper.validateOutputStream(outputStreamDefinition, table.getTableDefinition());
                 return new InsertIntoTableCallback(table, outputStreamDefinition, convertToStreamEvent,
-                        streamEventPool, streamEventConverter, siddhiQueryContext.getName());
+                        streamEventFactory, streamEventConverter, siddhiQueryContext.getName());
             } else {
                 if (!siddhiQueryContext.isPartitioned() || outputStreamDefinition.getId().startsWith("#")) {
                     return new InsertIntoStreamCallback(outputStreamDefinition, siddhiQueryContext.getName());
@@ -169,10 +169,10 @@ public static OutputCallback constructOutputCallback(final OutputStream outStrea
                         CompiledCondition compiledCondition = table.compileCondition(
                                 (((DeleteStream) outStream).getOnDeleteExpression()), matchingMetaInfoHolder,
                                 null, tableMap, siddhiQueryContext);
-                        StateEventPool stateEventPool = new StateEventPool(
-                                matchingMetaInfoHolder.getMetaStateEvent(), 10);
+                        StateEventFactory stateEventFactory = new StateEventFactory(
+                                matchingMetaInfoHolder.getMetaStateEvent());
                         return new DeleteTableCallback(table, compiledCondition, matchingMetaInfoHolder.
-                                getMatchingStreamEventIndex(), convertToStreamEvent, stateEventPool, streamEventPool,
+                                getMatchingStreamEventIndex(), convertToStreamEvent, stateEventFactory, streamEventFactory,
                                 streamEventConverter, siddhiQueryContext.getName());
                     } catch (SiddhiAppValidationException e) {
                         throw new SiddhiAppCreationException("Cannot create delete for table '" + outStream.getId() +
@@ -198,11 +198,11 @@ public static OutputCallback constructOutputCallback(final OutputStream outStrea
                         }
                         CompiledUpdateSet compiledUpdateSet = table.compileUpdateSet(updateSet, matchingMetaInfoHolder,
                                 null, tableMap, siddhiQueryContext);
-                        StateEventPool stateEventPool = new StateEventPool(
-                                matchingMetaInfoHolder.getMetaStateEvent(), 10);
+                        StateEventFactory stateEventFactory = new StateEventFactory(
+                                matchingMetaInfoHolder.getMetaStateEvent());
                         return new UpdateTableCallback(table, compiledCondition, compiledUpdateSet,
                                 matchingMetaInfoHolder.getMatchingStreamEventIndex(), convertToStreamEvent,
-                                stateEventPool, streamEventPool, streamEventConverter, siddhiQueryContext.getName());
+                                stateEventFactory, streamEventFactory, streamEventConverter, siddhiQueryContext.getName());
                     } catch (SiddhiAppValidationException e) {
                         throw new SiddhiAppCreationException("Cannot create update for table '" + outStream.getId() +
                                 "', " + e.getMessageWithOutContext(), e, e.getQueryContextStartIndex(),
@@ -229,10 +229,10 @@ public static OutputCallback constructOutputCallback(final OutputStream outStrea
                         }
                         CompiledUpdateSet compiledUpdateSet = table.compileUpdateSet(updateSet, matchingMetaInfoHolder,
                                 null, tableMap, siddhiQueryContext);
-                        StateEventPool stateEventPool = new StateEventPool(matchingMetaInfoHolder.getMetaStateEvent(), 10);
+                        StateEventFactory stateEventFactory = new StateEventFactory(matchingMetaInfoHolder.getMetaStateEvent());
                         return new UpdateOrInsertTableCallback(table, compiledCondition, compiledUpdateSet,
                                 matchingMetaInfoHolder.getMatchingStreamEventIndex(), convertToStreamEvent,
-                                stateEventPool, streamEventPool, streamEventConverter, siddhiQueryContext.getName());
+                                stateEventFactory, streamEventFactory, streamEventConverter, siddhiQueryContext.getName());
 
                     } catch (SiddhiAppValidationException e) {
                         throw new SiddhiAppCreationException("Cannot create update or insert into for table '" +
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StoreQueryParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StoreQueryParser.java
index f6004bf1eb..171df37c71 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StoreQueryParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/StoreQueryParser.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.state.MetaStateEvent;
-import io.siddhi.core.event.state.StateEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
 import io.siddhi.core.event.state.populater.StateEventPopulatorFactory;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.MetaStreamEvent.EventType;
@@ -392,8 +392,8 @@ private static StoreQueryRuntime constructRegularStoreQueryRuntime(Table table,
 
                 InsertStoreQueryRuntime insertStoreQueryRuntime =
                         new InsertStoreQueryRuntime(siddhiQueryContext.getName(), metaStreamEvent);
-                insertStoreQueryRuntime.setStateEventPool(
-                        new StateEventPool(matchingMetaInfoHolder.getMetaStateEvent(), 5));
+                insertStoreQueryRuntime.setStateEventFactory(
+                        new StateEventFactory(matchingMetaInfoHolder.getMetaStateEvent()));
                 insertStoreQueryRuntime.setSelector(querySelector);
                 insertStoreQueryRuntime.setOutputAttributes(matchingMetaInfoHolder.getMetaStateEvent()
                         .getOutputStreamDefinition().getAttributeList());
@@ -408,8 +408,8 @@ private static StoreQueryRuntime constructRegularStoreQueryRuntime(Table table,
 
                 DeleteStoreQueryRuntime deleteStoreQueryRuntime =
                         new DeleteStoreQueryRuntime(siddhiQueryContext.getName(), metaStreamEvent);
-                deleteStoreQueryRuntime.setStateEventPool(
-                        new StateEventPool(matchingMetaInfoHolder.getMetaStateEvent(), 5));
+                deleteStoreQueryRuntime.setStateEventFactory(
+                        new StateEventFactory(matchingMetaInfoHolder.getMetaStateEvent()));
                 deleteStoreQueryRuntime.setSelector(querySelector);
                 deleteStoreQueryRuntime.setOutputAttributes(matchingMetaInfoHolder.getMetaStateEvent()
                         .getOutputStreamDefinition().getAttributeList());
@@ -424,8 +424,8 @@ private static StoreQueryRuntime constructRegularStoreQueryRuntime(Table table,
 
                 UpdateStoreQueryRuntime updateStoreQueryRuntime =
                         new UpdateStoreQueryRuntime(siddhiQueryContext.getName(), metaStreamEvent);
-                updateStoreQueryRuntime.setStateEventPool(
-                        new StateEventPool(matchingMetaInfoHolder.getMetaStateEvent(), 5));
+                updateStoreQueryRuntime.setStateEventFactory(
+                        new StateEventFactory(matchingMetaInfoHolder.getMetaStateEvent()));
                 updateStoreQueryRuntime.setSelector(querySelector);
                 updateStoreQueryRuntime.setOutputAttributes(matchingMetaInfoHolder.getMetaStateEvent()
                         .getOutputStreamDefinition().getAttributeList());
@@ -440,8 +440,8 @@ private static StoreQueryRuntime constructRegularStoreQueryRuntime(Table table,
 
                 UpdateOrInsertStoreQueryRuntime updateOrInsertIntoStoreQueryRuntime =
                         new UpdateOrInsertStoreQueryRuntime(siddhiQueryContext.getName(), metaStreamEvent);
-                updateOrInsertIntoStoreQueryRuntime.setStateEventPool(
-                        new StateEventPool(matchingMetaInfoHolder.getMetaStateEvent(), 5));
+                updateOrInsertIntoStoreQueryRuntime.setStateEventFactory(
+                        new StateEventFactory(matchingMetaInfoHolder.getMetaStateEvent()));
                 updateOrInsertIntoStoreQueryRuntime.setSelector(querySelector);
                 updateOrInsertIntoStoreQueryRuntime.setOutputAttributes(matchingMetaInfoHolder.getMetaStateEvent()
                         .getOutputStreamDefinition().getAttributeList());
@@ -485,7 +485,7 @@ private static void populateFindStoreQueryRuntime(FindStoreQueryRuntime findStor
         QueryParserHelper.updateVariablePosition(metaStreamInfoHolder.getMetaStateEvent(), variableExpressionExecutors);
         querySelector.setEventPopulator(
                 StateEventPopulatorFactory.constructEventPopulator(metaStreamInfoHolder.getMetaStateEvent()));
-        findStoreQueryRuntime.setStateEventPool(new StateEventPool(metaStreamInfoHolder.getMetaStateEvent(), 5));
+        findStoreQueryRuntime.setStateEventFactory(new StateEventFactory(metaStreamInfoHolder.getMetaStateEvent()));
         findStoreQueryRuntime.setSelector(querySelector);
         findStoreQueryRuntime.setOutputAttributes(metaStreamInfoHolder.getMetaStateEvent().
                 getOutputStreamDefinition().getAttributeList());
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/DefinitionParserHelper.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/DefinitionParserHelper.java
index 8950915508..7c547998d6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/DefinitionParserHelper.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/DefinitionParserHelper.java
@@ -21,7 +21,7 @@
 import io.siddhi.core.config.SiddhiAppContext;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.exception.SiddhiAppCreationException;
 import io.siddhi.core.function.Script;
 import io.siddhi.core.stream.StreamJunction;
@@ -168,9 +168,9 @@ public static void addTable(TableDefinition tableDefinition, ConcurrentMap<Strin
                 tableMetaStreamEvent.addOutputData(attribute);
             }
 
-            StreamEventPool tableStreamEventPool = new StreamEventPool(tableMetaStreamEvent, 10);
+            StreamEventFactory tableStreamEventFactory = new StreamEventFactory(tableMetaStreamEvent);
             StreamEventCloner tableStreamEventCloner = new StreamEventCloner(tableMetaStreamEvent,
-                    tableStreamEventPool);
+                    tableStreamEventFactory);
 
             Annotation annotation = AnnotationHelper.getAnnotation(SiddhiConstants.ANNOTATION_STORE,
                     tableDefinition.getAnnotations());
@@ -209,7 +209,7 @@ public String getName() {
             } else {
                 table = new InMemoryTable();
             }
-            table.initTable(tableDefinition, tableStreamEventPool, tableStreamEventCloner, configReader,
+            table.initTable(tableDefinition, tableStreamEventFactory, tableStreamEventCloner, configReader,
                     siddhiAppContext, recordTableHandler);
             if (recordTableHandler != null) {
                 recordTableHandlerManager.registerRecordTableHandler(recordTableHandler.getId(),
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/QueryParserHelper.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/QueryParserHelper.java
index a4f0fd1809..d80b93465d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/QueryParserHelper.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/helper/QueryParserHelper.java
@@ -23,10 +23,10 @@
 import io.siddhi.core.event.state.MetaStateEvent;
 import io.siddhi.core.event.state.MetaStateEventAttribute;
 import io.siddhi.core.event.state.StateEventCloner;
-import io.siddhi.core.event.state.StateEventPool;
+import io.siddhi.core.event.state.StateEventFactory;
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.populater.ComplexEventPopulater;
 import io.siddhi.core.event.stream.populater.StreamEventPopulaterFactory;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -159,17 +159,17 @@ public static void initStreamRuntime(StreamRuntime runtime, MetaComplexEvent met
                     null, lockWrapper, queryName);
         } else {
             MetaStateEvent metaStateEvent = (MetaStateEvent) metaComplexEvent;
-            StateEventPool stateEventPool = new StateEventPool(metaStateEvent, 5);
+            StateEventFactory stateEventFactory = new StateEventFactory(metaStateEvent);
             MetaStreamEvent[] metaStreamEvents = metaStateEvent.getMetaStreamEvents();
             for (int i = 0, metaStreamEventsLength = metaStreamEvents.length; i < metaStreamEventsLength; i++) {
-                initSingleStreamRuntime(runtime.getSingleStreamRuntimes().get(i), i, metaStateEvent, stateEventPool,
+                initSingleStreamRuntime(runtime.getSingleStreamRuntimes().get(i), i, metaStateEvent, stateEventFactory,
                         lockWrapper, queryName);
             }
         }
     }
 
     private static void initSingleStreamRuntime(SingleStreamRuntime singleStreamRuntime, int streamEventChainIndex,
-                                                MetaComplexEvent metaComplexEvent, StateEventPool stateEventPool,
+                                                MetaComplexEvent metaComplexEvent, StateEventFactory stateEventFactory,
                                                 LockWrapper lockWrapper, String queryName) {
         MetaStreamEvent metaStreamEvent;
 
@@ -178,25 +178,25 @@ private static void initSingleStreamRuntime(SingleStreamRuntime singleStreamRunt
         } else {
             metaStreamEvent = (MetaStreamEvent) metaComplexEvent;
         }
-        StreamEventPool streamEventPool = new StreamEventPool(metaStreamEvent, 5);
+        StreamEventFactory streamEventFactory = new StreamEventFactory(metaStreamEvent);
         ProcessStreamReceiver processStreamReceiver = singleStreamRuntime.getProcessStreamReceiver();
         processStreamReceiver.setMetaStreamEvent(metaStreamEvent);
-        processStreamReceiver.setStreamEventPool(streamEventPool);
+        processStreamReceiver.setStreamEventFactory(streamEventFactory);
         processStreamReceiver.setLockWrapper(lockWrapper);
         processStreamReceiver.init();
         Processor processor = singleStreamRuntime.getProcessorChain();
         while (processor != null) {
             if (processor instanceof SchedulingProcessor) {
-                ((SchedulingProcessor) processor).getScheduler().setStreamEventPool(streamEventPool);
+                ((SchedulingProcessor) processor).getScheduler().setStreamEventFactory(streamEventFactory);
                 ((SchedulingProcessor) processor).getScheduler().init(lockWrapper, queryName);
             }
             if (processor instanceof AbstractStreamProcessor) {
                 ((AbstractStreamProcessor) processor)
-                        .setStreamEventCloner(new StreamEventCloner(metaStreamEvent, streamEventPool));
+                        .setStreamEventCloner(new StreamEventCloner(metaStreamEvent, streamEventFactory));
                 ((AbstractStreamProcessor) processor).constructStreamEventPopulater(metaStreamEvent,
                         streamEventChainIndex);
             }
-            if (stateEventPool != null && processor instanceof JoinProcessor) {
+            if (stateEventFactory != null && processor instanceof JoinProcessor) {
                 if (((JoinProcessor) processor)
                         .getCompiledCondition() instanceof IncrementalAggregateCompileCondition) {
                     IncrementalAggregateCompileCondition compiledCondition = (IncrementalAggregateCompileCondition) (
@@ -206,16 +206,16 @@ private static void initSingleStreamRuntime(SingleStreamRuntime singleStreamRunt
                     compiledCondition.setComplexEventPopulater(complexEventPopulater);
 
                 }
-                ((JoinProcessor) processor).setStateEventPool(stateEventPool);
+                ((JoinProcessor) processor).setStateEventFactory(stateEventFactory);
             }
-            if (stateEventPool != null && processor instanceof StreamPreStateProcessor) {
-                ((StreamPreStateProcessor) processor).setStateEventPool(stateEventPool);
-                ((StreamPreStateProcessor) processor).setStreamEventPool(streamEventPool);
+            if (stateEventFactory != null && processor instanceof StreamPreStateProcessor) {
+                ((StreamPreStateProcessor) processor).setStateEventFactory(stateEventFactory);
+                ((StreamPreStateProcessor) processor).setStreamEventFactory(streamEventFactory);
                 ((StreamPreStateProcessor) processor)
-                        .setStreamEventCloner(new StreamEventCloner(metaStreamEvent, streamEventPool));
+                        .setStreamEventCloner(new StreamEventCloner(metaStreamEvent, streamEventFactory));
                 if (metaComplexEvent instanceof MetaStateEvent) {
                     ((StreamPreStateProcessor) processor).setStateEventCloner(
-                            new StateEventCloner(((MetaStateEvent) metaComplexEvent), stateEventPool));
+                            new StateEventCloner(((MetaStateEvent) metaComplexEvent), stateEventFactory));
                 }
             }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/window/Window.java b/modules/siddhi-core/src/main/java/io/siddhi/core/window/Window.java
index 2f994b925a..4a9b5e6d2f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/window/Window.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/window/Window.java
@@ -24,7 +24,7 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.ZeroStreamEventConverter;
 import io.siddhi.core.exception.OperationNotSupportedException;
 import io.siddhi.core.executor.VariableExpressionExecutor;
@@ -96,9 +96,9 @@ public class Window implements FindableProcessor, MemoryCalculable {
      */
     private WindowProcessor internalWindowProcessor;
     /**
-     * StreamEventPool to create new empty StreamEvent.
+     * StreamEventFactory to create new empty StreamEvent.
      */
-    private StreamEventPool streamEventPool;
+    private StreamEventFactory streamEventFactory;
 
     /**
      * window operation latency and throughput trackers
@@ -156,8 +156,8 @@ public void init(Map<String, Table> tableMap, Map<String, Window> eventWindowMap
             metaStreamEvent.addOutputData(attribute);
         }
 
-        this.streamEventPool = new StreamEventPool(metaStreamEvent, 5);
-        StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent, this.streamEventPool);
+        this.streamEventFactory = new StreamEventFactory(metaStreamEvent);
+        StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent, this.streamEventFactory);
         OutputStream.OutputEventType outputEventType = windowDefinition.getOutputEventType();
         boolean outputExpectsExpiredEvents = outputEventType != OutputStream.OutputEventType.CURRENT_EVENTS;
 
@@ -174,7 +174,7 @@ public void init(Map<String, Table> tableMap, Map<String, Window> eventWindowMap
             entryValveProcessor = new EntryValveProcessor(this.siddhiAppContext);
             Scheduler scheduler = SchedulerParser.parse(entryValveProcessor, siddhiQueryContext);
             scheduler.init(this.lockWrapper, windowName);
-            scheduler.setStreamEventPool(streamEventPool);
+            scheduler.setStreamEventFactory(streamEventFactory);
             ((SchedulingProcessor) internalWindowProcessor).setScheduler(scheduler);
         }
         if (entryValveProcessor != null) {
@@ -220,14 +220,14 @@ public void add(ComplexEventChunk complexEventChunk) {
 
             // Convert all events to StreamEvent because StateEvents can be passed if directly received from a join
             ComplexEvent complexEvents = complexEventChunk.getFirst();
-            StreamEvent firstEvent = streamEventPool.borrowEvent();
+            StreamEvent firstEvent = streamEventFactory.newInstance();
             eventConverter.convertComplexEvent(complexEvents, firstEvent);
             StreamEvent currentEvent = firstEvent;
             complexEvents = complexEvents.getNext();
             int numberOfEvents = 0;
             while (complexEvents != null) {
                 numberOfEvents++;
-                StreamEvent nextEvent = streamEventPool.borrowEvent();
+                StreamEvent nextEvent = streamEventFactory.newInstance();
                 eventConverter.convertComplexEvent(complexEvents, nextEvent);
                 currentEvent.setNext(nextEvent);
                 currentEvent = nextEvent;
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/SnapshotableEventQueueTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/SnapshotableEventQueueTestCase.java
index d7e574fcda..f154ead5b7 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/managment/SnapshotableEventQueueTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/managment/SnapshotableEventQueueTestCase.java
@@ -22,7 +22,7 @@
 import io.siddhi.core.event.stream.Operation;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventCloner;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.holder.SnapshotableStreamEventQueue;
 import io.siddhi.core.event.stream.holder.StreamEventClonerHolder;
 import io.siddhi.core.util.snapshot.state.Snapshot;
@@ -84,7 +84,7 @@ public void incrementalPersistenceTest1() throws InterruptedException, IOExcepti
         metaStreamEvent.addOutputData(new Attribute("volume", Attribute.Type.LONG));
 
         StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent,
-                new StreamEventPool(metaStreamEvent, 5));
+                new StreamEventFactory(metaStreamEvent));
 
         SnapshotableStreamEventQueue snapshotableStreamEventQueue =
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
@@ -164,7 +164,7 @@ public void incrementalPersistenceTest2() throws InterruptedException, IOExcepti
         metaStreamEvent.addOutputData(new Attribute("volume", Attribute.Type.LONG));
 
         StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent,
-                new StreamEventPool(metaStreamEvent, 5));
+                new StreamEventFactory(metaStreamEvent));
 
         SnapshotableStreamEventQueue snapshotableStreamEventQueue =
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
@@ -223,7 +223,7 @@ public void incrementalPersistenceTest3() throws InterruptedException, IOExcepti
         metaStreamEvent.addOutputData(new Attribute("volume", Attribute.Type.LONG));
 
         StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent,
-                new StreamEventPool(metaStreamEvent, 5));
+                new StreamEventFactory(metaStreamEvent));
         SnapshotableStreamEventQueue snapshotableStreamEventQueue =
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         StreamEvent streamEvent = new StreamEvent(metaStreamEvent.getBeforeWindowData().size(),
@@ -284,7 +284,7 @@ public void incrementalPersistenceTest4() throws InterruptedException, IOExcepti
         metaStreamEvent.addOutputData(new Attribute("volume", Attribute.Type.LONG));
 
         StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent,
-                new StreamEventPool(metaStreamEvent, 5));
+                new StreamEventFactory(metaStreamEvent));
         SnapshotableStreamEventQueue snapshotableStreamEventQueue =
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         StreamEvent streamEvent = new StreamEvent(metaStreamEvent.getBeforeWindowData().size(),
@@ -347,7 +347,7 @@ public void incrementalPersistenceTest5() throws InterruptedException, IOExcepti
         metaStreamEvent.addOutputData(new Attribute("volume", Attribute.Type.LONG));
 
         StreamEventCloner streamEventCloner = new StreamEventCloner(metaStreamEvent,
-                new StreamEventPool(metaStreamEvent, 5));
+                new StreamEventFactory(metaStreamEvent));
         SnapshotableStreamEventQueue snapshotableStreamEventQueue =
                 new SnapshotableStreamEventQueue(new StreamEventClonerHolder(streamEventCloner));
         StreamEvent streamEvent = new StreamEvent(metaStreamEvent.getBeforeWindowData().size(),
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/JunctionTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/JunctionTestCase.java
index 88f34740e4..00a92d28bf 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/JunctionTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/JunctionTestCase.java
@@ -21,7 +21,6 @@
 import io.siddhi.core.config.SiddhiContext;
 import io.siddhi.core.event.Event;
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.stream.output.StreamCallback;
 import io.siddhi.query.api.annotation.Annotation;
 import io.siddhi.query.api.definition.Attribute;
@@ -424,186 +423,4 @@ public void receive(Event[] streamEvents) {
         streamJunctionB.stopProcessing();
         streamJunctionC.stopProcessing();
     }
-
-
-    @Test
-    public void multiThreadedWithEventPoolTest() throws InterruptedException {
-        log.info("multi threaded test using event pool");
-
-        final StreamEventPool streamEventPoolA1 = new StreamEventPool(2, 2, 2, 4);
-        final StreamEventPool streamEventPoolA2 = new StreamEventPool(2, 2, 2, 4);
-        final StreamEventPool streamEventPoolA3 = new StreamEventPool(2, 2, 2, 4);
-        final StreamEventPool streamEventPoolB1 = new StreamEventPool(2, 2, 2, 4);
-        final StreamEventPool streamEventPoolB2 = new StreamEventPool(2, 2, 2, 4);
-
-
-        StreamDefinition streamA = StreamDefinition.id("streamA").attribute("symbol", Attribute.Type.STRING)
-                .attribute("price", Attribute.Type.INT).
-                        annotation(Annotation.annotation("async"));
-        StreamJunction streamJunctionA = new StreamJunction(streamA, executorService, 1024,
-                null, siddhiAppContext);
-        StreamJunction.Publisher streamPublisherA = streamJunctionA.constructPublisher();
-
-        StreamDefinition streamB = StreamDefinition.id("streamB").attribute("symbol", Attribute.Type.STRING)
-                .attribute("price", Attribute.Type.INT).
-                        annotation(Annotation.annotation("async"));
-        StreamJunction streamJunctionB = new StreamJunction(streamB, executorService, 1024,
-                null, siddhiAppContext);
-        final StreamJunction.Publisher streamPublisherB1 = streamJunctionB.constructPublisher();
-        final StreamJunction.Publisher streamPublisherB2 = streamJunctionB.constructPublisher();
-        final StreamJunction.Publisher streamPublisherB3 = streamJunctionB.constructPublisher();
-
-        StreamDefinition streamC = StreamDefinition.id("streamC").attribute("symbol", Attribute.Type.STRING)
-                .attribute("price", Attribute.Type.INT).
-                        annotation(Annotation.annotation("async"));
-        StreamJunction streamJunctionC = new StreamJunction(streamC, executorService, 1024,
-                null, siddhiAppContext);
-        final StreamJunction.Publisher streamPublisherC1 = streamJunctionC.constructPublisher();
-        final StreamJunction.Publisher streamPublisherC2 = streamJunctionC.constructPublisher();
-
-        StreamCallback streamCallbackA1 = new StreamCallback() {
-            @Override
-            public void receive(Event[] streamEvents) {
-                for (Event streamEvent : streamEvents) {
-                    StreamEvent innerStreamEvent = streamEventPoolA1.borrowEvent();
-                    innerStreamEvent.setTimestamp(streamEvent.getTimestamp());
-                    Object[] data = new Object[]{streamEvent.getData()[0], streamEvent.getData()[1]};
-                    data[0] = ((String) data[0]).concat("A1");
-                    innerStreamEvent.setOutputData(data);
-                    streamPublisherB1.send(innerStreamEvent);
-                }
-            }
-        };
-
-        StreamCallback streamCallbackA2 = new StreamCallback() {
-            @Override
-            public void receive(Event[] streamEvents) {
-                for (Event streamEvent : streamEvents) {
-                    StreamEvent innerStreamEvent = streamEventPoolA2.borrowEvent();
-                    innerStreamEvent.setTimestamp(streamEvent.getTimestamp());
-                    Object[] data = new Object[]{streamEvent.getData()[0], streamEvent.getData()[1]};
-                    data[0] = ((String) data[0]).concat("A2");
-                    innerStreamEvent.setOutputData(data);
-                    streamPublisherB2.send(innerStreamEvent);
-                }
-            }
-        };
-
-        StreamCallback streamCallbackA3 = new StreamCallback() {
-            @Override
-            public void receive(Event[] streamEvents) {
-                for (Event streamEvent : streamEvents) {
-                    StreamEvent innerStreamEvent = streamEventPoolA3.borrowEvent();
-                    innerStreamEvent.setTimestamp(streamEvent.getTimestamp());
-                    Object[] data = new Object[]{streamEvent.getData()[0], streamEvent.getData()[1]};
-                    data[0] = ((String) data[0]).concat("A3");
-                    innerStreamEvent.setOutputData(data);
-                    streamPublisherB3.send(innerStreamEvent);
-                }
-            }
-        };
-
-
-        StreamCallback streamCallbackB1 = new StreamCallback() {
-            @Override
-            public void receive(Event[] streamEvents) {
-                for (Event streamEvent : streamEvents) {
-                    StreamEvent innerStreamEvent = streamEventPoolB1.borrowEvent();
-                    innerStreamEvent.setTimestamp(streamEvent.getTimestamp());
-                    Object[] data = new Object[]{streamEvent.getData()[0], streamEvent.getData()[1]};
-                    data[0] = ((String) data[0]).concat("B1");
-                    innerStreamEvent.setOutputData(data);
-                    streamPublisherC1.send(innerStreamEvent);
-                }
-            }
-        };
-
-        StreamCallback streamCallbackB2 = new StreamCallback() {
-            @Override
-            public void receive(Event[] streamEvents) {
-                for (Event streamEvent : streamEvents) {
-                    StreamEvent innerStreamEvent = streamEventPoolB2.borrowEvent();
-                    innerStreamEvent.setTimestamp(streamEvent.getTimestamp());
-                    Object[] data = new Object[]{streamEvent.getData()[0], streamEvent.getData()[1]};
-                    data[0] = ((String) data[0]).concat("B2");
-                    innerStreamEvent.setOutputData(data);
-                    streamPublisherC2.send(innerStreamEvent);
-                }
-            }
-        };
-
-
-        final boolean[] eventsArrived = {false, false, false, false, false, false, false, false, false, false, false,
-                false};
-
-
-        StreamCallback streamCallbackC = new StreamCallback() {
-            @Override
-            public void receive(Event[] streamEvents) {
-                for (Event streamEvent : streamEvents) {
-                    count++;
-                    eventArrived = true;
-                    Object symbol = streamEvent.getData()[0];
-                    if (symbol.equals("IBMA1B1")) {
-                        eventsArrived[0] = true;
-                    } else if (symbol.equals("IBMA1B2")) {
-                        eventsArrived[1] = true;
-                    } else if (symbol.equals("IBMA2B1")) {
-                        eventsArrived[2] = true;
-                    } else if (symbol.equals("IBMA2B2")) {
-                        eventsArrived[3] = true;
-                    } else if (symbol.equals("IBMA3B1")) {
-                        eventsArrived[4] = true;
-                    } else if (symbol.equals("IBMA3B2")) {
-                        eventsArrived[5] = true;
-                    }
-                    if (symbol.equals("WSO2A1B1")) {
-                        eventsArrived[6] = true;
-                    } else if (symbol.equals("WSO2A1B2")) {
-                        eventsArrived[7] = true;
-                    } else if (symbol.equals("WSO2A2B1")) {
-                        eventsArrived[8] = true;
-                    } else if (symbol.equals("WSO2A2B2")) {
-                        eventsArrived[9] = true;
-                    } else if (symbol.equals("WSO2A3B1")) {
-                        eventsArrived[10] = true;
-                    } else if (symbol.equals("WSO2A3B2")) {
-                        eventsArrived[11] = true;
-                    }
-                }
-            }
-        };
-
-        streamJunctionA.subscribe(streamCallbackA1);
-        streamJunctionA.subscribe(streamCallbackA2);
-        streamJunctionA.subscribe(streamCallbackA3);
-        streamJunctionA.startProcessing();
-
-        streamJunctionB.subscribe(streamCallbackB1);
-        streamJunctionB.subscribe(streamCallbackB2);
-        streamJunctionB.startProcessing();
-
-        streamJunctionC.subscribe(streamCallbackC);
-        streamJunctionC.startProcessing();
-
-        StreamEvent streamEvent1 = new StreamEvent(2, 2, 2);
-        streamEvent1.setTimestamp(System.currentTimeMillis());
-        streamEvent1.setOutputData(new Object[]{"IBM", 12});
-
-        StreamEvent streamEvent2 = new StreamEvent(2, 2, 2);
-        streamEvent2.setTimestamp(System.currentTimeMillis());
-        streamEvent2.setOutputData(new Object[]{"WSO2", 112});
-
-        streamPublisherA.send(streamEvent1);
-        streamPublisherA.send(streamEvent2);
-        Thread.sleep(1000);
-        AssertJUnit.assertTrue(eventArrived);
-        AssertJUnit.assertEquals(12, count);
-        for (boolean arrived : eventsArrived) {
-            AssertJUnit.assertTrue(arrived);
-        }
-        streamJunctionA.stopProcessing();
-        streamJunctionB.stopProcessing();
-        streamJunctionC.stopProcessing();
-    }
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/ComplexEventChunkTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/ComplexEventChunkTestCase.java
index fdb71f95a5..9248152ed8 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/ComplexEventChunkTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/ComplexEventChunkTestCase.java
@@ -19,7 +19,7 @@
 package io.siddhi.core.stream.event;
 
 import io.siddhi.core.event.stream.StreamEvent;
-import io.siddhi.core.event.stream.StreamEventPool;
+import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.event.stream.converter.ConversionStreamEventChunk;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
 import io.siddhi.core.event.stream.converter.ZeroStreamEventConverter;
@@ -53,9 +53,9 @@ public void eventChunkTest() {
         streamEvent1.setNext(streamEvent2);
         streamEvent2.setNext(streamEvent3);
 
-        StreamEventPool streamEventPool = new StreamEventPool(0, 0, 3, 5);
+        StreamEventFactory streamEventFactory = new StreamEventFactory(0, 0, 3);
         ConversionStreamEventChunk streamEventChunk = new ConversionStreamEventChunk(streamEventConverter,
-                streamEventPool);
+                streamEventFactory);
         streamEventChunk.convertAndAssign(streamEvent1);
 
         while (streamEventChunk.hasNext()) {
@@ -80,9 +80,9 @@ public void eventChunkRemoveTest1() {
         streamEvent1.setNext(streamEvent2);
         streamEvent2.setNext(streamEvent3);
 
-        StreamEventPool streamEventPool = new StreamEventPool(0, 0, 3, 5);
+        StreamEventFactory streamEventFactory = new StreamEventFactory(0, 0, 3);
         ConversionStreamEventChunk streamEventChunk = new ConversionStreamEventChunk(streamEventConverter,
-                streamEventPool);
+                streamEventFactory);
         streamEventChunk.convertAndAssign(streamEvent1);
 
         while (streamEventChunk.hasNext()) {
@@ -113,9 +113,9 @@ public void eventChunkRemoveTest2() {
         streamEvent2.setNext(streamEvent3);
         streamEvent3.setNext(streamEvent4);
 
-        StreamEventPool streamEventPool = new StreamEventPool(0, 0, 3, 5);
+        StreamEventFactory streamEventFactory = new StreamEventFactory(0, 0, 3);
         ConversionStreamEventChunk streamEventChunk = new ConversionStreamEventChunk(streamEventConverter,
-                streamEventPool);
+                streamEventFactory);
         streamEventChunk.convertAndAssign(streamEvent1);
 
         while (streamEventChunk.hasNext()) {
@@ -148,9 +148,9 @@ public void eventChunkRemoveTest3() {
         streamEvent2.setNext(streamEvent3);
         streamEvent3.setNext(streamEvent4);
 
-        StreamEventPool streamEventPool = new StreamEventPool(0, 0, 3, 5);
+        StreamEventFactory streamEventFactory = new StreamEventFactory(0, 0, 3);
         ConversionStreamEventChunk streamEventChunk = new ConversionStreamEventChunk(streamEventConverter,
-                streamEventPool);
+                streamEventFactory);
         streamEventChunk.convertAndAssign(streamEvent1);
 
         while (streamEventChunk.hasNext()) {
@@ -179,9 +179,9 @@ public void eventChunkRemoveTest4() {
         streamEvent2.setNext(streamEvent3);
         streamEvent3.setNext(streamEvent4);
 
-        StreamEventPool streamEventPool = new StreamEventPool(0, 0, 3, 5);
+        StreamEventFactory streamEventFactory = new StreamEventFactory(0, 0, 3);
         ConversionStreamEventChunk streamEventChunk = new ConversionStreamEventChunk(streamEventConverter,
-                streamEventPool);
+                streamEventFactory);
         streamEventChunk.convertAndAssign(streamEvent1);
 
         while (streamEventChunk.hasNext()) {
@@ -207,9 +207,9 @@ public void eventChunkRemoveTest5() {
 
         streamEvent1.setNext(streamEvent2);
 
-        StreamEventPool streamEventPool = new StreamEventPool(0, 0, 3, 5);
+        StreamEventFactory streamEventFactory = new StreamEventFactory(0, 0, 3);
         ConversionStreamEventChunk streamEventChunk = new ConversionStreamEventChunk(streamEventConverter,
-                streamEventPool);
+                streamEventFactory);
         streamEventChunk.convertAndAssign(streamEvent1);
 
         streamEventChunk.remove();
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
index 86bfc2f28a..3038e4ee70 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
@@ -25,7 +25,6 @@
 import io.siddhi.core.event.stream.MetaStreamEvent;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventFactory;
-import io.siddhi.core.event.stream.StreamEventPool;
 import io.siddhi.core.event.stream.converter.SelectiveStreamEventConverter;
 import io.siddhi.core.event.stream.converter.SimpleStreamEventConverter;
 import io.siddhi.core.event.stream.converter.StreamEventConverter;
@@ -83,26 +82,6 @@ public void testEventCreation() {
         AssertJUnit.assertEquals(4, streamEvent.getOutputData().length);
     }
 
-    @Test
-    public void testEventPool() {
-        StreamEventPool streamEventPool = new StreamEventPool(2, 3, 1, 4);
-
-        StreamEvent[] streamEvents = new StreamEvent[5];
-        for (int i = 0; i < 5; i++) {
-            streamEvents[i] = streamEventPool.borrowEvent();
-        }
-        AssertJUnit.assertEquals(0, streamEventPool.getBufferedEventsSize());
-
-        for (int i = 0; i < 5; i++) {
-            streamEventPool.returnEvents(streamEvents[i]);
-        }
-        AssertJUnit.assertEquals(4, streamEventPool.getBufferedEventsSize());
-
-        streamEventPool.borrowEvent();
-        AssertJUnit.assertEquals(3, streamEventPool.getBufferedEventsSize());
-
-    }
-
     @Test
     public void testPassThroughStreamEventConverter() {
         Attribute symbol = new Attribute("symbol", Attribute.Type.STRING);
@@ -122,17 +101,17 @@ public void testPassThroughStreamEventConverter() {
         metaStreamEvent.addInputDefinition(streamDefinition);
 
         StreamEventConverter converter = StreamEventConverterFactory.constructEventConverter(metaStreamEvent);
-        StreamEventPool eventPool = new StreamEventPool(metaStreamEvent, 5);
+        StreamEventFactory eventPool = new StreamEventFactory(metaStreamEvent);
 
-        StreamEvent borrowedEvent = eventPool.borrowEvent();
-        converter.convertEvent(event, borrowedEvent);
+        StreamEvent newEvent = eventPool.newInstance();
+        converter.convertEvent(event, newEvent);
 
         AssertJUnit.assertTrue(converter instanceof ZeroStreamEventConverter);
-        AssertJUnit.assertEquals(3, borrowedEvent.getOutputData().length);
+        AssertJUnit.assertEquals(3, newEvent.getOutputData().length);
 
-        AssertJUnit.assertEquals("WSO2", borrowedEvent.getOutputData()[0]);
-        AssertJUnit.assertEquals(200.0, borrowedEvent.getOutputData()[1]);
-        AssertJUnit.assertEquals(50, borrowedEvent.getOutputData()[2]);
+        AssertJUnit.assertEquals("WSO2", newEvent.getOutputData()[0]);
+        AssertJUnit.assertEquals(200.0, newEvent.getOutputData()[1]);
+        AssertJUnit.assertEquals(50, newEvent.getOutputData()[2]);
     }
 
     @Test
@@ -150,17 +129,17 @@ public void testSimpleStreamEventConverter() {
 
         metaStreamEvent.addInputDefinition(streamDefinition);
         StreamEventConverter converter = StreamEventConverterFactory.constructEventConverter(metaStreamEvent);
-        StreamEventPool eventPool = new StreamEventPool(metaStreamEvent, 5);
-        StreamEvent borrowedEvent = eventPool.borrowEvent();
-        converter.convertEvent(event, borrowedEvent);
+        StreamEventFactory eventPool = new StreamEventFactory(metaStreamEvent);
+        StreamEvent newEvent = eventPool.newInstance();
+        converter.convertEvent(event, newEvent);
 
         AssertJUnit.assertTrue(converter instanceof SimpleStreamEventConverter);
-        AssertJUnit.assertNull(borrowedEvent.getBeforeWindowData());
-        AssertJUnit.assertNull(borrowedEvent.getOnAfterWindowData());
-        AssertJUnit.assertEquals(2, borrowedEvent.getOutputData().length);
+        AssertJUnit.assertNull(newEvent.getBeforeWindowData());
+        AssertJUnit.assertNull(newEvent.getOnAfterWindowData());
+        AssertJUnit.assertEquals(2, newEvent.getOutputData().length);
 
-        AssertJUnit.assertEquals(200, borrowedEvent.getOutputData()[1]);
-        AssertJUnit.assertEquals("WSO2", borrowedEvent.getOutputData()[0]);
+        AssertJUnit.assertEquals(200, newEvent.getOutputData()[1]);
+        AssertJUnit.assertEquals("WSO2", newEvent.getOutputData()[0]);
     }
 
     @Test
@@ -182,19 +161,19 @@ public void testStreamEventConverter() {
 
         metaStreamEvent.addInputDefinition(streamDefinition);
         StreamEventConverter converter = StreamEventConverterFactory.constructEventConverter(metaStreamEvent);
-        StreamEventPool eventPool = new StreamEventPool(metaStreamEvent, 5);
+        StreamEventFactory eventPool = new StreamEventFactory(metaStreamEvent);
 
-        StreamEvent borrowedEvent = eventPool.borrowEvent();
-        converter.convertEvent(event, borrowedEvent);
+        StreamEvent newEvent = eventPool.newInstance();
+        converter.convertEvent(event, newEvent);
 
         AssertJUnit.assertTrue(converter instanceof SelectiveStreamEventConverter);
-        AssertJUnit.assertEquals(1, borrowedEvent.getBeforeWindowData().length);      //volume
-        AssertJUnit.assertEquals(1, borrowedEvent.getOnAfterWindowData().length);     //price
-        AssertJUnit.assertEquals(2, borrowedEvent.getOutputData().length);            //symbol and avgPrice
+        AssertJUnit.assertEquals(1, newEvent.getBeforeWindowData().length);      //volume
+        AssertJUnit.assertEquals(1, newEvent.getOnAfterWindowData().length);     //price
+        AssertJUnit.assertEquals(2, newEvent.getOutputData().length);            //symbol and avgPrice
 
-        AssertJUnit.assertEquals(50, borrowedEvent.getBeforeWindowData()[0]);
-        AssertJUnit.assertEquals(200, borrowedEvent.getOnAfterWindowData()[0]);
-        AssertJUnit.assertEquals("WSO2", borrowedEvent.getOutputData()[0]);
+        AssertJUnit.assertEquals(50, newEvent.getBeforeWindowData()[0]);
+        AssertJUnit.assertEquals(200, newEvent.getOnAfterWindowData()[0]);
+        AssertJUnit.assertEquals("WSO2", newEvent.getOutputData()[0]);
     }
 
     @Test

From f86f8ff14fc6bd5203bb76d324fa801b5fe78acf Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Thu, 28 Mar 2019 22:30:47 +0530
Subject: [PATCH 14/21] Add partition purging

with following syntax

@purge(enable='true', interval='1 sec', retention.period='1 sec')
partition with (symbol of streamA)
begin
   @info(name = 'query1')
   from streamA#window.length(3)
   select symbol, avg(price) as total
   insert into StockQuote;
end
---
 docs/api/latest.md                            |   2 +-
 .../aggregation/IncrementalDataPurging.java   |   6 +-
 .../core/partition/PartitionRuntime.java      |  94 ++++++++++++-
 .../partition/PartitionStreamReceiver.java    |   9 --
 .../state/AbsentLogicalPreStateProcessor.java |   3 +-
 .../state/AbsentStreamPreStateProcessor.java  |   3 +-
 .../output/ratelimit/OutputRateLimiter.java   |   2 +-
 .../PassThroughOutputRateLimiter.java         |   6 -
 .../event/FirstPerEventOutputRateLimiter.java |  26 ++--
 ...yWindowedPerSnapshotOutputRateLimiter.java |  23 +++-
 ...nWindowedPerSnapshotOutputRateLimiter.java |  38 ++++--
 ...yWindowedPerSnapshotOutputRateLimiter.java |  35 +++--
 ...gregationPerSnapshotOutputRateLimiter.java |  34 +++--
 .../GroupByPerSnapshotOutputRateLimiter.java  |  36 +++--
 .../PerSnapshotOutputRateLimiter.java         |  42 +++---
 .../WindowedPerSnapshotOutputRateLimiter.java |  49 ++++---
 .../time/AllPerTimeOutputRateLimiter.java     |  42 +++---
 .../FirstGroupByPerTimeOutputRateLimiter.java |  43 +++---
 .../time/FirstPerTimeOutputRateLimiter.java   |  38 +++---
 .../LastGroupByPerTimeOutputRateLimiter.java  |  40 +++---
 .../time/LastPerTimeOutputRateLimiter.java    |  40 +++---
 .../stream/window/CronWindowProcessor.java    |   6 +-
 .../ExternalTimeBatchWindowProcessor.java     |  15 +-
 .../stream/window/SessionWindowProcessor.java |   4 +-
 .../window/TimeBatchWindowProcessor.java      |   4 +-
 .../window/TimeLengthWindowProcessor.java     |   4 +-
 .../stream/window/TimeWindowProcessor.java    |   4 +-
 .../CountAttributeAggregatorExecutor.java     |   2 +-
 ...tinctCountAttributeAggregatorExecutor.java |   2 +-
 .../MaxAttributeAggregatorExecutor.java       |  35 +++--
 .../MinAttributeAggregatorExecutor.java       |   8 +-
 .../UnionSetAttributeAggregatorExecutor.java  |   2 +-
 .../java/io/siddhi/core/util/Scheduler.java   |   8 ++
 .../io/siddhi/core/util/SiddhiConstants.java  |   5 +-
 .../core/util/parser/AggregationParser.java   |   2 +-
 .../siddhi/core/util/parser/OutputParser.java |  24 ++--
 .../core/util/parser/PartitionParser.java     |   2 +-
 .../siddhi/core/util/parser/QueryParser.java  |   7 +-
 .../core/util/parser/SiddhiAppParser.java     |   2 +-
 .../PartitionDataPurgingTestCase.java         | 129 ++++++++++++++++++
 .../query/window/TimeBatchWindowTestCase.java |   1 -
 .../core/stream/event/EventTestCase.java      |   2 +-
 42 files changed, 582 insertions(+), 297 deletions(-)
 create mode 100644 modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionDataPurgingTestCase.java

diff --git a/docs/api/latest.md b/docs/api/latest.md
index f10a5db218..65edb147dc 100644
--- a/docs/api/latest.md
+++ b/docs/api/latest.md
@@ -1,4 +1,4 @@
-# API Docs - v5.0.0-m4
+# API Docs - v5.0.0-SNAPSHOT
 
 ## Core
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataPurging.java b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataPurging.java
index 140b29cc84..2bf893dfa1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataPurging.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/IncrementalDataPurging.java
@@ -144,11 +144,11 @@ public void init(AggregationDefinition aggregationDefinition, StreamEventFactory
             }
             if (purgingEnabled) {
                 // If interval is defined, default value of 15 min will be replaced by user input value
-                if (purge.getElement(SiddhiConstants.NAMESPACE_INTERVAL) != null) {
-                    String interval = purge.getElement(SiddhiConstants.NAMESPACE_INTERVAL);
+                if (purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_INTERVAL) != null) {
+                    String interval = purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_INTERVAL);
                     purgeExecutionInterval = timeToLong(interval);
                 }
-                List<Annotation> retentions = purge.getAnnotations(SiddhiConstants.NAMESPACE_RETENTION);
+                List<Annotation> retentions = purge.getAnnotations(SiddhiConstants.NAMESPACE_RETENTION_PERIOD);
                 if (retentions != null && !retentions.isEmpty()) {
                     Annotation retention = retentions.get(0);
                     List<Element> elements = retention.getElements();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
index be466d26fe..bd44a65af1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
@@ -36,6 +36,7 @@
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateHolder;
 import io.siddhi.core.util.statistics.MemoryUsageTracker;
+import io.siddhi.query.api.annotation.Annotation;
 import io.siddhi.query.api.annotation.Element;
 import io.siddhi.query.api.definition.AbstractDefinition;
 import io.siddhi.query.api.definition.StreamDefinition;
@@ -52,6 +53,7 @@
 import io.siddhi.query.api.execution.query.input.stream.SingleInputStream;
 import io.siddhi.query.api.execution.query.input.stream.StateInputStream;
 import io.siddhi.query.api.execution.query.output.stream.InsertIntoStream;
+import io.siddhi.query.api.expression.Expression;
 import io.siddhi.query.api.util.AnnotationHelper;
 
 import java.util.ArrayList;
@@ -62,6 +64,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Runtime class to handle partitioning. It will hold all information regarding current partitions and wil create
@@ -71,6 +74,10 @@ public class PartitionRuntime {
 
 
     private final StateHolder<PartitionState> stateHolder;
+    //default every 5 min
+    private long purgeExecutionInterval = 300000;
+    private boolean purgingEnabled = false;
+    private long purgeRetentionPeriod = 0;
     private String partitionName;
     private Partition partition;
     private ConcurrentMap<String, StreamJunction> localStreamJunctionMap = new ConcurrentHashMap<>();
@@ -107,6 +114,35 @@ public PartitionRuntime(ConcurrentMap<String, AbstractDefinition> streamDefiniti
         if (partitionName == null) {
             this.partitionName = "partition_" + partitionIndex;
         }
+
+        Annotation purge = AnnotationHelper.getAnnotation(SiddhiConstants.NAMESPACE_PURGE, partition.getAnnotations());
+        if (purge != null) {
+            if (purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_ENABLE) != null) {
+                String purgeEnable = purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_ENABLE);
+                if (!("true".equalsIgnoreCase(purgeEnable) || "false".equalsIgnoreCase(purgeEnable))) {
+                    throw new SiddhiAppCreationException("Invalid value for enable: " + purgeEnable + "." +
+                            " Please use 'true' or 'false'");
+                } else {
+                    purgingEnabled = Boolean.parseBoolean(purgeEnable);
+                }
+            } else {
+                throw new SiddhiAppCreationException("Annotation @" + SiddhiConstants.NAMESPACE_PURGE +
+                        " is missing element '" + SiddhiConstants.ANNOTATION_ELEMENT_ENABLE + "'");
+            }
+            if (purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_RETENTION_PERIOD) != null) {
+                String purgeRetention = purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_RETENTION_PERIOD);
+                purgeRetentionPeriod = Expression.Time.timeToLong(purgeRetention);
+
+            } else {
+                throw new SiddhiAppCreationException("Annotation @" + SiddhiConstants.NAMESPACE_PURGE +
+                        " is missing element '" + SiddhiConstants.ANNOTATION_ELEMENT_RETENTION_PERIOD + "'");
+            }
+
+            if (purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_INTERVAL) != null) {
+                String interval = purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_INTERVAL);
+                purgeExecutionInterval = Expression.Time.timeToLong(interval);
+            }
+        }
         this.partition = partition;
         this.streamDefinitionMap = streamDefinitionMap;
         this.windowDefinitionMap = windowDefinitionMap;
@@ -308,21 +344,65 @@ public void setMemoryUsageTracker(MemoryUsageTracker memoryUsageTracker) {
     public void start() {
         PartitionState state = stateHolder.getState();
         try {
-            if (!state.partitionKeys.contains(SiddhiAppContext.getPartitionFlowId())) {
-                state.partitionKeys.add(SiddhiAppContext.getPartitionFlowId());
-                for (QueryRuntime queryRuntime : queryRuntimeList) {
-                    queryRuntime.start();
+            Long time = state.partitionKeys.get(SiddhiAppContext.getPartitionFlowId());
+            if (time == null) {
+                synchronized (state) {
+                    time = state.partitionKeys.get(SiddhiAppContext.getPartitionFlowId());
+                    if (time == null) {
+                        for (QueryRuntime queryRuntime : queryRuntimeList) {
+                            queryRuntime.start();
+                        }
+                    }
+                    state.partitionKeys.put(SiddhiAppContext.getPartitionFlowId(),
+                            siddhiAppContext.getTimestampGenerator().currentTime());
                 }
+            } else {
+                state.partitionKeys.put(SiddhiAppContext.getPartitionFlowId(),
+                        siddhiAppContext.getTimestampGenerator().currentTime());
             }
         } finally {
             stateHolder.returnState(state);
         }
+        if (purgingEnabled) {
+            siddhiAppContext.getScheduledExecutorService().scheduleWithFixedDelay(new Runnable() {
+                @Override
+                public void run() {
+                    long currentTime = siddhiAppContext.getTimestampGenerator().currentTime();
+                    PartitionState state = stateHolder.getState();
+                    try {
+                        synchronized (state) {
+                            HashMap<String, Long> partitions = new HashMap<>(state.partitionKeys);
+                            for (Map.Entry<String, Long> partition : partitions.entrySet()) {
+                                if (partition.getValue() + purgeRetentionPeriod < currentTime) {
+                                    state.partitionKeys.remove(partition.getKey());
+                                    SiddhiAppContext.startPartitionFlow(partition.getKey());
+                                    try {
+                                        for (QueryRuntime queryRuntime : queryRuntimeList) {
+                                            Map<String, StateHolder> elementHolderMap =
+                                                    siddhiAppContext.getSnapshotService().getStateHolderMap(
+                                                            partitionName, queryRuntime.getQueryId());
+                                            for (StateHolder stateHolder : elementHolderMap.values()) {
+                                                stateHolder.cleanGroupByStates();
+                                            }
+                                        }
+                                    } finally {
+                                        SiddhiAppContext.stopPartitionFlow();
+                                    }
+                                }
+                            }
+                        }
+                    } finally {
+                        stateHolder.returnState(state);
+                    }
+                }
+            }, purgeExecutionInterval, purgeExecutionInterval, TimeUnit.MILLISECONDS);
+        }
     }
 
     public Set<String> getPartitionKeys() {
         PartitionState state = stateHolder.getState();
         try {
-            return state.partitionKeys;
+            return new HashSet<>(state.partitionKeys.keySet());
         } finally {
             stateHolder.returnState(state);
         }
@@ -333,7 +413,7 @@ public Set<String> getPartitionKeys() {
      */
     public class PartitionState extends State {
 
-        private Set<String> partitionKeys = new HashSet<>();
+        private Map<String, Long> partitionKeys = new ConcurrentHashMap<>();
 
         @Override
         public boolean canDestroy() {
@@ -349,7 +429,7 @@ public Map<String, Object> snapshot() {
 
         @Override
         public void restore(Map<String, Object> state) {
-            partitionKeys = (Set<String>) state.get("PartitionKeys");
+            partitionKeys = (Map<String, Long>) state.get("PartitionKeys");
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
index f054912071..cedd041bc6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
@@ -107,7 +107,6 @@ public void receive(ComplexEvent complexEvent) {
                     ComplexEvent aEvent = complexEventChunk.next();
                     complexEventChunk.remove();
                     StreamEvent newEvent = streamEventFactory.newInstance();
-                    ;
                     streamEventConverter.convertComplexEvent(aEvent, newEvent);
                     boolean currentEventMatchedPrevPartitionExecutor = false;
                     for (PartitionExecutor partitionExecutor : partitionExecutors) {
@@ -127,7 +126,6 @@ public void receive(ComplexEvent complexEvent) {
                                     currentKey = key;
                                     outputEventChunk.clear();
                                     StreamEvent cloneEvent = streamEventFactory.newInstance();
-                                    ;
                                     streamEventConverter.convertComplexEvent(aEvent, cloneEvent);
                                     outputEventChunk.add(cloneEvent);
                                 }
@@ -149,7 +147,6 @@ public void receive(ComplexEvent complexEvent) {
     @Override
     public void receive(Event event) {
         StreamEvent newEvent = streamEventFactory.newInstance();
-        ;
         streamEventConverter.convertEvent(event, newEvent);
         for (PartitionExecutor partitionExecutor : partitionExecutors) {
             String key = partitionExecutor.execute(newEvent);
@@ -163,7 +160,6 @@ public void receive(Event event) {
     @Override
     public void receive(long timestamp, Object[] data) {
         StreamEvent newEvent = streamEventFactory.newInstance();
-        ;
         streamEventConverter.convertData(timestamp, data, newEvent);
         if (partitionExecutors.size() == 0) {
             send(newEvent);
@@ -180,12 +176,10 @@ public void receive(Event[] events) {
         if (partitionExecutors.size() == 0) {
             StreamEvent currentEvent;
             StreamEvent firstEvent = streamEventFactory.newInstance();
-            ;
             streamEventConverter.convertEvent(events[0], firstEvent);
             currentEvent = firstEvent;
             for (int i = 1; i < events.length; i++) {
                 StreamEvent nextEvent = streamEventFactory.newInstance();
-                ;
                 streamEventConverter.convertEvent(events[i], nextEvent);
                 currentEvent.setNext(nextEvent);
                 currentEvent = nextEvent;
@@ -197,7 +191,6 @@ public void receive(Event[] events) {
             StreamEvent currentEvent = null;
             for (Event event : events) {
                 StreamEvent nextEvent = streamEventFactory.newInstance();
-                ;
                 streamEventConverter.convertEvent(event, nextEvent);
                 for (PartitionExecutor partitionExecutor : partitionExecutors) {
                     String currentKey = partitionExecutor.execute(nextEvent);
@@ -228,7 +221,6 @@ public void receive(List<Event> events) {
             StreamEvent currentEvent = null;
             for (Event event : events) {
                 StreamEvent nextEvent = streamEventFactory.newInstance();
-                ;
                 streamEventConverter.convertEvent(event, nextEvent);
                 if (firstEvent == null) {
                     firstEvent = nextEvent;
@@ -244,7 +236,6 @@ public void receive(List<Event> events) {
             StreamEvent currentEvent = null;
             for (Event event : events) {
                 StreamEvent nextEvent = streamEventFactory.newInstance();
-                ;
                 streamEventConverter.convertEvent(event, nextEvent);
                 for (PartitionExecutor partitionExecutor : partitionExecutors) {
                     String currentKey = partitionExecutor.execute(nextEvent);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
index 4c7fa4e4be..9b0518097a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
@@ -344,8 +344,7 @@ public void start() {
 
     @Override
     public void stop() {
-        // Scheduler will be stopped automatically
-        // Nothing to stop here
+        scheduler.stop();
     }
 
     public boolean partnerCanProceed(StateEvent stateEvent) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
index 0550f6998b..bec4793396 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
@@ -294,8 +294,7 @@ public void start() {
 
     @Override
     public void stop() {
-        // Scheduler will be stopped automatically
-        // Nothing to stop here
+        scheduler.stop();
     }
 
     class LogicalStreamPreState extends StreamPreState {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
index 37acaf452a..da0c2689c6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
@@ -46,8 +46,8 @@ public abstract class OutputRateLimiter<S extends State> implements ExternalRefe
     protected LatencyTracker latencyTracker;
     protected SiddhiQueryContext siddhiQueryContext;
     protected LockWrapper lockWrapper;
-    private boolean hasCallBack = false;
     protected StateHolder<S> stateHolder;
+    private boolean hasCallBack = false;
 
     public void init(LockWrapper lockWrapper, boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
         this.siddhiQueryContext = siddhiQueryContext;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
index bdc6aa7604..31a0c3eabd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
@@ -34,12 +34,6 @@ public PassThroughOutputRateLimiter(String id) {
         this.id = id;
     }
 
-    public PassThroughOutputRateLimiter clone(String key) {
-        PassThroughOutputRateLimiter instance = new PassThroughOutputRateLimiter(id + key);
-        instance.setLatencyTracker(latencyTracker);
-        return instance;
-    }
-
     @Override
     protected StateFactory init() {
         return null;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
index e731096ba7..121e9c5b3e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
@@ -52,22 +52,22 @@ public void process(ComplexEventChunk complexEventChunk) {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
-            while (complexEventChunk.hasNext()) {
-                ComplexEvent event = complexEventChunk.next();
-                if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
-                    if (state.counter == 0) {
-                        complexEventChunk.remove();
-                        ComplexEventChunk<ComplexEvent> firstPerEventChunk = new ComplexEventChunk<ComplexEvent>
-                                (complexEventChunk.isBatch());
-                        firstPerEventChunk.add(event);
-                        outputEventChunks.add(firstPerEventChunk);
-                    }
-                    if (++state.counter == value) {
-                        state.counter = 0;
+                while (complexEventChunk.hasNext()) {
+                    ComplexEvent event = complexEventChunk.next();
+                    if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
+                        if (state.counter == 0) {
+                            complexEventChunk.remove();
+                            ComplexEventChunk<ComplexEvent> firstPerEventChunk = new ComplexEventChunk<ComplexEvent>
+                                    (complexEventChunk.isBatch());
+                            firstPerEventChunk.add(event);
+                            outputEventChunks.add(firstPerEventChunk);
+                        }
+                        if (++state.counter == value) {
+                            state.counter = 0;
+                        }
                     }
                 }
             }
-        }
         } finally {
             stateHolder.returnState(state);
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index f8a0f23103..7211d868a3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -22,6 +22,8 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
+import io.siddhi.core.event.stream.StreamEventFactory;
+import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.StateFactory;
 
 import java.util.ArrayList;
@@ -51,6 +53,9 @@ protected AggregationGroupByWindowedPerSnapshotOutputRateLimiter(Long value,
 
     @Override
     protected StateFactory<AggregationRateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new AggregationGroupByRateLimiterState();
     }
 
@@ -119,10 +124,10 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
                                 AggregationGroupByRateLimiterState state) {
-        if (event.getTimestamp() >= scheduledTime) {
+        if (event.getTimestamp() >= state.scheduledTime) {
             constructOutputChunk(outputEventChunks, state);
-            scheduledTime = scheduledTime + value;
-            scheduler.notifyAt(scheduledTime);
+            state.scheduledTime = state.scheduledTime + value;
+            scheduler.notifyAt(state.scheduledTime);
         }
     }
 
@@ -146,6 +151,10 @@ private void constructOutputChunk(List<ComplexEventChunk<ComplexEvent>> outputEv
         outputEventChunks.add(outputEventChunk);
     }
 
+    @Override
+    public void stop() {
+        scheduler.stop();
+    }
 
     class AggregationGroupByRateLimiterState extends AggregationRateLimiterState {
 
@@ -153,13 +162,13 @@ class AggregationGroupByRateLimiterState extends AggregationRateLimiterState {
         private Map<String, Map<Integer, Object>> groupByAggregateAttributeValueMap;
 
         public AggregationGroupByRateLimiterState() {
-            groupByAggregateAttributeValueMap = new HashMap<String, Map<Integer, Object>>();
-            eventList = new LinkedList<GroupedComplexEvent>();
+            groupByAggregateAttributeValueMap = new HashMap<>();
+            eventList = new LinkedList<>();
         }
 
         @Override
         public boolean canDestroy() {
-            return groupByAggregateAttributeValueMap.isEmpty() && eventList.isEmpty();
+            return groupByAggregateAttributeValueMap.isEmpty() && eventList.isEmpty() && scheduledTime == 0;
         }
 
         @Override
@@ -167,6 +176,7 @@ public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("EventList", eventList);
             state.put("GroupByAggregateAttributeValueMap", groupByAggregateAttributeValueMap);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
@@ -175,6 +185,7 @@ public void restore(Map<String, Object> state) {
             eventList = (List<GroupedComplexEvent>) state.get("EventList");
             groupByAggregateAttributeValueMap = (Map<String, Map<Integer, Object>>) state.get
                     ("GroupByAggregateAttributeValueMap");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
index f75ce12129..c538e7dd1e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
@@ -46,8 +46,6 @@ public class AggregationWindowedPerSnapshotOutputRateLimiter
     protected Comparator<ComplexEvent> comparator;
     protected List<Integer> aggregateAttributePositionList;
     protected Scheduler scheduler;
-    protected long scheduledTime;
-
 
     protected AggregationWindowedPerSnapshotOutputRateLimiter(Long value,
                                                               final List<Integer> aggregateAttributePositionList,
@@ -90,6 +88,9 @@ public int compare(ComplexEvent event1, ComplexEvent event2) {
 
     @Override
     protected StateFactory<AggregationRateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new AggregationRateLimiterState();
     }
 
@@ -140,7 +141,7 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     private void tryFlushEvents(ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
                                 AggregationRateLimiterState state) {
-        if (event.getTimestamp() >= scheduledTime) {
+        if (event.getTimestamp() >= state.scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
             for (ComplexEvent originalComplexEvent : state.eventList) {
                 ComplexEvent eventCopy = cloneComplexEvent(originalComplexEvent);
@@ -150,39 +151,44 @@ private void tryFlushEvents(ArrayList<ComplexEventChunk<ComplexEvent>> outputEve
                 outputEventChunk.add(eventCopy);
             }
             outputEventChunks.add(outputEventChunk);
-            scheduledTime += value;
-            scheduler.notifyAt(scheduledTime);
+            state.scheduledTime += value;
+            scheduler.notifyAt(state.scheduledTime);
         }
     }
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        AggregationRateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     class AggregationRateLimiterState extends State {
 
         private List<ComplexEvent> eventList;
         private Map<Integer, Object> aggregateAttributeValueMap;
+        protected long scheduledTime;
 
         public AggregationRateLimiterState() {
-            this.eventList = new LinkedList<ComplexEvent>();
-            aggregateAttributeValueMap = new HashMap<Integer, Object>(aggregateAttributePositionList.size());
+            this.eventList = new LinkedList<>();
+            aggregateAttributeValueMap = new HashMap<>(aggregateAttributePositionList.size());
         }
 
         @Override
         public boolean canDestroy() {
-            return aggregateAttributeValueMap.isEmpty() && eventList.isEmpty();
+            return aggregateAttributeValueMap.isEmpty() && eventList.isEmpty() && scheduledTime == 0;
         }
 
         @Override
@@ -190,6 +196,7 @@ public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("EventList", eventList);
             state.put("AggregateAttributeValueMap", aggregateAttributeValueMap);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
@@ -197,6 +204,7 @@ public Map<String, Object> snapshot() {
         public void restore(Map<String, Object> state) {
             eventList = (List<ComplexEvent>) state.get("EventList");
             aggregateAttributeValueMap = (Map<Integer, Object>) state.get("AdgregateAttributeValueMap");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index 651ba9dbc4..eb223242f2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -44,7 +44,6 @@ public class AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter
         extends SnapshotOutputRateLimiter<AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
     private Scheduler scheduler;
-    private long scheduledTime;
 
     public AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter(Long value,
                                                                      WrappedSnapshotOutputRateLimiter
@@ -57,6 +56,9 @@ public AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter(Long value,
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -101,7 +103,7 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
                                 RateLimiterState state) {
-        if (event.getTimestamp() >= scheduledTime) {
+        if (event.getTimestamp() >= state.scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
             for (Iterator<Map.Entry<String, LastEventHolder>> iterator = state.groupByKeyEvents.entrySet().iterator();
                  iterator.hasNext(); ) {
@@ -116,24 +118,28 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
                 }
             }
             outputEventChunks.add(outputEventChunk);
-            scheduledTime += value;
-            scheduler.notifyAt(scheduledTime);
+            state.scheduledTime += value;
+            scheduler.notifyAt(state.scheduledTime);
         }
     }
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     private class LastEventHolder {
@@ -158,23 +164,26 @@ public void checkAndClearLastInEvent() {
     }
 
     class RateLimiterState extends State {
-        private Map<String, LastEventHolder> groupByKeyEvents = new LinkedHashMap<String, LastEventHolder>();
+        public long scheduledTime;
+        private Map<String, LastEventHolder> groupByKeyEvents = new LinkedHashMap<>();
 
         @Override
         public boolean canDestroy() {
-            return groupByKeyEvents.isEmpty();
+            return groupByKeyEvents.isEmpty() && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("GroupByKeyEvents", groupByKeyEvents);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
             groupByKeyEvents = (Map<String, LastEventHolder>) state.get("GroupByKeyEvents");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
index 84a9372fc3..b55b072872 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
@@ -39,7 +39,6 @@ public class AllAggregationPerSnapshotOutputRateLimiter
         extends SnapshotOutputRateLimiter<AllAggregationPerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
     private Scheduler scheduler;
-    private long scheduledTime;
 
     public AllAggregationPerSnapshotOutputRateLimiter(Long value,
                                                       WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
@@ -50,6 +49,9 @@ public AllAggregationPerSnapshotOutputRateLimiter(Long value,
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -86,50 +88,58 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
                                 RateLimiterState state) {
-        if (event.getTimestamp() >= scheduledTime) {
+        if (event.getTimestamp() >= state.scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
             if (state.lastEvent != null) {
                 outputEventChunk.add(cloneComplexEvent(state.lastEvent));
             }
             outputEventChunks.add(outputEventChunk);
-            scheduledTime += value;
-            scheduler.notifyAt(scheduledTime);
+            state.scheduledTime += value;
+            scheduler.notifyAt(state.scheduledTime);
         }
     }
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
+
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     class RateLimiterState extends State {
+        public long scheduledTime;
         private ComplexEvent lastEvent = null;
 
         @Override
         public boolean canDestroy() {
-            return lastEvent == null;
+            return lastEvent == null && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("LastEvent", lastEvent);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
             lastEvent = (ComplexEvent) state.get("LastEvent");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
index c7cde09bd7..06db7b7d20 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
@@ -41,7 +41,6 @@ public class GroupByPerSnapshotOutputRateLimiter
         extends SnapshotOutputRateLimiter<GroupByPerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
     private Scheduler scheduler;
-    private long scheduledTime;
 
     public GroupByPerSnapshotOutputRateLimiter(Long value,
                                                WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
@@ -52,6 +51,9 @@ public GroupByPerSnapshotOutputRateLimiter(Long value,
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -92,51 +94,57 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
                                 RateLimiterState state) {
-        if (event.getTimestamp() >= scheduledTime) {
+        if (event.getTimestamp() >= state.scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
             for (ComplexEvent complexEvent : state.groupByKeyEvents.values()) {
                 outputEventChunk.add(cloneComplexEvent(complexEvent));
             }
             outputEventChunks.add(outputEventChunk);
-            scheduledTime += value;
-            scheduler.notifyAt(scheduledTime);
+            state.scheduledTime += value;
+            scheduler.notifyAt(state.scheduledTime);
         }
     }
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     class RateLimiterState extends State {
-        private Map<String, ComplexEvent> groupByKeyEvents = new LinkedHashMap<String, ComplexEvent>();
+        public long scheduledTime;
+        private Map<String, ComplexEvent> groupByKeyEvents = new LinkedHashMap<>();
 
         @Override
         public boolean canDestroy() {
-            return groupByKeyEvents.isEmpty();
+            return groupByKeyEvents.isEmpty() && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("GroupByKeyEvents", groupByKeyEvents);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
             groupByKeyEvents = (Map<String, ComplexEvent>) state.get("groupByKeyEvents");
-
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
index 50a42663d3..6ee6babd90 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
@@ -43,7 +43,6 @@ public class PerSnapshotOutputRateLimiter
     private final Long value;
     private ComplexEvent lastEvent;
     private Scheduler scheduler;
-    private long scheduledTime;
 
     public PerSnapshotOutputRateLimiter(Long value,
                                         WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
@@ -54,6 +53,9 @@ public PerSnapshotOutputRateLimiter(Long value,
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -67,13 +69,13 @@ public void process(ComplexEventChunk complexEventChunk) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
                     if (event.getType() == ComplexEvent.Type.TIMER) {
-                        tryFlushEvents(outputEventChunks, event);
+                        tryFlushEvents(outputEventChunks, event, state);
                     } else if (event.getType() == ComplexEvent.Type.CURRENT) {
                         complexEventChunk.remove();
-                        tryFlushEvents(outputEventChunks, event);
+                        tryFlushEvents(outputEventChunks, event, state);
                         lastEvent = event;
                     } else {
-                        tryFlushEvents(outputEventChunks, event);
+                        tryFlushEvents(outputEventChunks, event, state);
                     }
                 }
             }
@@ -85,46 +87,53 @@ public void process(ComplexEventChunk complexEventChunk) {
         }
     }
 
-    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event) {
-        if (event.getTimestamp() >= scheduledTime) {
+    private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
+                                RateLimiterState state) {
+        if (event.getTimestamp() >= state.scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
             if (lastEvent != null) {
                 outputEventChunk.add(cloneComplexEvent(lastEvent));
             }
             outputEventChunks.add(outputEventChunk);
-            scheduledTime += value;
-            scheduler.notifyAt(scheduledTime);
+            state.scheduledTime += value;
+            scheduler.notifyAt(state.scheduledTime);
         }
     }
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     class RateLimiterState extends State {
 
+        public long scheduledTime;
         private ComplexEventChunk<ComplexEvent> eventChunk = new ComplexEventChunk<ComplexEvent>(false);
 
         @Override
         public boolean canDestroy() {
-            return eventChunk.getFirst() == null;
+            return eventChunk.getFirst() == null && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("EventChunk", eventChunk.getFirst());
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
@@ -132,6 +141,7 @@ public Map<String, Object> snapshot() {
         public void restore(Map<String, Object> state) {
             eventChunk.clear();
             eventChunk.add((ComplexEvent) state.get("EventList"));
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
index bb6897d52d..e2eba7d1b7 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
@@ -45,21 +45,17 @@ public class WindowedPerSnapshotOutputRateLimiter
     private final Long value;
     private Comparator comparator;
     private Scheduler scheduler;
-    private long scheduledTime;
 
     public WindowedPerSnapshotOutputRateLimiter(Long value,
                                                 WrappedSnapshotOutputRateLimiter wrappedSnapshotOutputRateLimiter,
                                                 boolean groupBy, SiddhiQueryContext siddhiQueryContext) {
         super(wrappedSnapshotOutputRateLimiter, siddhiQueryContext, groupBy);
         this.value = value;
-        this.comparator = new Comparator<ComplexEvent>() {
-            @Override
-            public int compare(ComplexEvent event1, ComplexEvent event2) {
-                if (Arrays.equals(event1.getOutputData(), event2.getOutputData())) {
-                    return 0;
-                } else {
-                    return 1;
-                }
+        this.comparator = (Comparator<ComplexEvent>) (event1, event2) -> {
+            if (Arrays.equals(event1.getOutputData(), event2.getOutputData())) {
+                return 0;
+            } else {
+                return 1;
             }
         };
     }
@@ -67,6 +63,9 @@ public int compare(ComplexEvent event1, ComplexEvent event2) {
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -113,52 +112,58 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChunks, ComplexEvent event,
                                 RateLimiterState state) {
-        if (event.getTimestamp() >= scheduledTime) {
+        if (event.getTimestamp() >= state.scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
             for (ComplexEvent complexEvent : state.eventList) {
                 outputEventChunk.add(cloneComplexEvent(complexEvent));
             }
             outputEventChunks.add(outputEventChunk);
-            scheduledTime = scheduledTime + value;
-            scheduler.notifyAt(scheduledTime);
+            state.scheduledTime = state.scheduledTime + value;
+            scheduler.notifyAt(state.scheduledTime);
         }
     }
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0,
-                0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     class RateLimiterState extends State {
 
-        List<ComplexEvent> eventList = new LinkedList<ComplexEvent>();
+        private List<ComplexEvent> eventList = new LinkedList<>();
+        private long scheduledTime;
 
         @Override
         public boolean canDestroy() {
-            return eventList.isEmpty();
+            return eventList.isEmpty() && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("EventList", eventList);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
             eventList = (List<ComplexEvent>) state.get("EventList");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
index 46f938e48b..c6324f3329 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit all
@@ -45,18 +44,18 @@ public class AllPerTimeOutputRateLimiter
     private static final Logger log = Logger.getLogger(AllPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
-    private long scheduledTime;
 
-    public AllPerTimeOutputRateLimiter(String id, Long value, ScheduledExecutorService scheduledExecutorService) {
+    public AllPerTimeOutputRateLimiter(String id, Long value) {
         this.id = id;
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
     }
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -71,7 +70,7 @@ public void process(ComplexEventChunk complexEventChunk) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
                     if (event.getType() == ComplexEvent.Type.TIMER) {
-                        if (event.getTimestamp() >= scheduledTime) {
+                        if (event.getTimestamp() >= state.scheduledTime) {
                             ComplexEvent first = state.allComplexEventChunk.getFirst();
                             if (first != null) {
                                 state.allComplexEventChunk.clear();
@@ -80,8 +79,8 @@ public void process(ComplexEventChunk complexEventChunk) {
                                 outputEventChunk.add(first);
                                 outputEventChunks.add(outputEventChunk);
                             }
-                            scheduledTime = scheduledTime + value;
-                            scheduler.notifyAt(scheduledTime);
+                            state.scheduledTime = state.scheduledTime + value;
+                            scheduler.notifyAt(state.scheduledTime);
                         }
                     } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
                             .EXPIRED) {
@@ -100,34 +99,38 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     class RateLimiterState extends State {
 
-        private ComplexEventChunk<ComplexEvent> allComplexEventChunk =
-                new ComplexEventChunk<ComplexEvent>(false);
-
+        private ComplexEventChunk<ComplexEvent> allComplexEventChunk = new ComplexEventChunk<>(false);
+        private long scheduledTime;
 
         @Override
         public boolean canDestroy() {
-            return allComplexEventChunk.getFirst() == null;
+            return allComplexEventChunk.getFirst() == null && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
@@ -135,6 +138,7 @@ public Map<String, Object> snapshot() {
         public void restore(Map<String, Object> state) {
             allComplexEventChunk.clear();
             allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
index 48c85d54c9..2f493090da 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
@@ -34,7 +34,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit only first
@@ -45,19 +44,18 @@ public class FirstGroupByPerTimeOutputRateLimiter
     private static final Logger log = Logger.getLogger(FirstGroupByPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
-    private long scheduledTime;
 
-    public FirstGroupByPerTimeOutputRateLimiter(String id, Long value, ScheduledExecutorService
-            scheduledExecutorService) {
+    public FirstGroupByPerTimeOutputRateLimiter(String id, Long value) {
         this.id = id;
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
     }
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -71,7 +69,7 @@ public void process(ComplexEventChunk complexEventChunk) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
                     if (event.getType() == ComplexEvent.Type.TIMER) {
-                        if (event.getTimestamp() >= scheduledTime) {
+                        if (event.getTimestamp() >= state.scheduledTime) {
                             if (state.allComplexEventChunk.getFirst() != null) {
                                 ComplexEventChunk<ComplexEvent> eventChunk = new ComplexEventChunk<ComplexEvent>
                                         (complexEventChunk.isBatch());
@@ -82,8 +80,8 @@ public void process(ComplexEventChunk complexEventChunk) {
                             } else {
                                 state.groupByKeys.clear();
                             }
-                            scheduledTime = scheduledTime + value;
-                            scheduler.notifyAt(scheduledTime);
+                            state.scheduledTime = state.scheduledTime + value;
+                            scheduler.notifyAt(state.scheduledTime);
                         }
                     } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
                             .EXPIRED) {
@@ -106,29 +104,32 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     class RateLimiterState extends State {
 
         private List<String> groupByKeys = new ArrayList<String>();
-        private ComplexEventChunk<ComplexEvent> allComplexEventChunk =
-                new ComplexEventChunk<ComplexEvent>(false);
-
+        private ComplexEventChunk<ComplexEvent> allComplexEventChunk = new ComplexEventChunk<>(false);
+        private long scheduledTime;
 
         @Override
         public boolean canDestroy() {
-            return groupByKeys.size() == 0;
+            return groupByKeys.size() == 0 && scheduledTime == 0;
         }
 
         @Override
@@ -136,6 +137,7 @@ public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
             state.put("GroupByKeys", groupByKeys);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
@@ -144,6 +146,7 @@ public void restore(Map<String, Object> state) {
             allComplexEventChunk.clear();
             allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
             groupByKeys = (List<String>) state.get("GroupByKeys");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
index c51fc3d818..e2a8976dd4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit only first
@@ -44,18 +43,18 @@ public class FirstPerTimeOutputRateLimiter
     private final Long value;
     private String id;
     private ComplexEvent firstEvent = null;
-    private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
-    private long scheduledTime;
 
-    public FirstPerTimeOutputRateLimiter(String id, Long value, ScheduledExecutorService scheduledExecutorService) {
+    public FirstPerTimeOutputRateLimiter(String id, Long value) {
         this.id = id;
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
     }
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -69,12 +68,12 @@ public void process(ComplexEventChunk complexEventChunk) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
                     if (event.getType() == ComplexEvent.Type.TIMER) {
-                        if (event.getTimestamp() >= scheduledTime) {
+                        if (event.getTimestamp() >= state.scheduledTime) {
                             if (firstEvent != null) {
                                 firstEvent = null;
                             }
-                            scheduledTime += value;
-                            scheduler.notifyAt(scheduledTime);
+                            state.scheduledTime += value;
+                            scheduler.notifyAt(state.scheduledTime);
                         }
                     } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
                             .EXPIRED) {
@@ -99,38 +98,45 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
     class RateLimiterState extends State {
 
         private ComplexEvent firstEvent = null;
+        private long scheduledTime;
 
         @Override
         public boolean canDestroy() {
-            return firstEvent == null;
+            return firstEvent == null && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("FirstEvent", firstEvent);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
             firstEvent = (ComplexEvent) state.get("FirstEvent");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
index 873f4bdbc1..f057ae0cfa 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
@@ -35,7 +35,6 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit only last
@@ -46,19 +45,18 @@ public class LastGroupByPerTimeOutputRateLimiter
     private static final Logger log = Logger.getLogger(LastGroupByPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
-    private long scheduledTime;
 
-    public LastGroupByPerTimeOutputRateLimiter(String id, Long value, ScheduledExecutorService
-            scheduledExecutorService) {
+    public LastGroupByPerTimeOutputRateLimiter(String id, Long value) {
         this.id = id;
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
     }
 
     @Override
     protected StateFactory<RateLimiterState> init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -72,7 +70,7 @@ public void process(ComplexEventChunk complexEventChunk) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
                     if (event.getType() == ComplexEvent.Type.TIMER) {
-                        if (event.getTimestamp() >= scheduledTime) {
+                        if (event.getTimestamp() >= state.scheduledTime) {
                             if (state.allGroupByKeyEvents.size() != 0) {
                                 ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
                                         (complexEventChunk.isBatch());
@@ -82,8 +80,8 @@ public void process(ComplexEventChunk complexEventChunk) {
                                 outputEventChunks.add(outputEventChunk);
                                 state.allGroupByKeyEvents.clear();
                             }
-                            scheduledTime = scheduledTime + value;
-                            scheduler.notifyAt(scheduledTime);
+                            state.scheduledTime = state.scheduledTime + value;
+                            scheduler.notifyAt(state.scheduledTime);
                         }
                     } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
                             .EXPIRED) {
@@ -105,39 +103,45 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
-
     class RateLimiterState extends State {
 
+        public long scheduledTime;
         private Map<String, ComplexEvent> allGroupByKeyEvents = new LinkedHashMap<String, ComplexEvent>();
 
         @Override
         public boolean canDestroy() {
-            return allGroupByKeyEvents.size() == 0;
+            return allGroupByKeyEvents.size() == 0 && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("AllGroupByKeyEvents", allGroupByKeyEvents);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
             allGroupByKeyEvents = (Map<String, ComplexEvent>) state.get("AllGroupByKeyEvents");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
index 88a52ad1df..8e5a4f01b0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Implementation of {@link OutputRateLimiter} which will collect pre-defined time period and the emit only last
@@ -43,19 +42,18 @@ public class LastPerTimeOutputRateLimiter extends OutputRateLimiter<LastPerTimeO
     private static final Logger log = Logger.getLogger(LastPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private ScheduledExecutorService scheduledExecutorService;
     private Scheduler scheduler;
-    private long scheduledTime;
 
-    public LastPerTimeOutputRateLimiter(String id, Long value, ScheduledExecutorService scheduledExecutorService) {
+    public LastPerTimeOutputRateLimiter(String id, Long value) {
         this.id = id;
         this.value = value;
-        this.scheduledExecutorService = scheduledExecutorService;
     }
 
-
     @Override
     protected StateFactory init() {
+        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
+        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
+        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
@@ -70,7 +68,7 @@ public void process(ComplexEventChunk complexEventChunk) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
                     if (event.getType() == ComplexEvent.Type.TIMER) {
-                        if (event.getTimestamp() >= scheduledTime) {
+                        if (event.getTimestamp() >= state.scheduledTime) {
                             if (state.lastEvent != null) {
                                 ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
                                         (complexEventChunk.isBatch());
@@ -78,8 +76,8 @@ public void process(ComplexEventChunk complexEventChunk) {
                                 state.lastEvent = null;
                                 outputEventChunks.add(outputEventChunk);
                             }
-                            scheduledTime = scheduledTime + value;
-                            scheduler.notifyAt(scheduledTime);
+                            state.scheduledTime = state.scheduledTime + value;
+                            scheduler.notifyAt(state.scheduledTime);
                         }
                     } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
                             .EXPIRED) {
@@ -98,39 +96,45 @@ public void process(ComplexEventChunk complexEventChunk) {
 
     @Override
     public void start() {
-        scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        scheduler.init(lockWrapper, siddhiQueryContext.getName());
-        long currentTime = System.currentTimeMillis();
-        scheduledTime = currentTime + value;
-        scheduler.notifyAt(scheduledTime);
+        RateLimiterState state = stateHolder.getState();
+        try {
+            synchronized (state) {
+                long currentTime = System.currentTimeMillis();
+                state.scheduledTime = currentTime + value;
+                scheduler.notifyAt(state.scheduledTime);
+            }
+        } finally {
+            stateHolder.returnState(state);
+        }
     }
 
     @Override
     public void stop() {
-        //Nothing to stop
+        scheduler.stop();
     }
 
-
     class RateLimiterState extends State {
 
         private ComplexEvent lastEvent = null;
+        private long scheduledTime;
 
         @Override
         public boolean canDestroy() {
-            return lastEvent == null;
+            return lastEvent == null && scheduledTime == 0;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("LastEvent", lastEvent);
+            state.put("ScheduledTime", scheduledTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
             lastEvent = (ComplexEvent) state.get("LastEvent");
+            scheduledTime = (Long) state.get("ScheduledTime");
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
index 88347e27f7..b585baf898 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/CronWindowProcessor.java
@@ -132,8 +132,10 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
     }
 
     @Override
-    public void start() {
-        scheduleCronJob(cronString);
+    public synchronized void start() {
+        if (scheduler == null) {
+            scheduleCronJob(cronString);
+        }
     }
 
     @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
index 5617148f95..5d89d498ec 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/ExternalTimeBatchWindowProcessor.java
@@ -210,8 +210,7 @@ protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, C
                     "timeout, <bool> replaceTimestampWithBatchEndTime), but found " + attributeExpressionExecutors
                     .length + " input attributes");
         }
-        return () -> new WindowState(streamEventClonerHolder, outputExpectsExpiredEvents,
-                schedulerTimeout, commonStartTime);
+        return () -> new WindowState(outputExpectsExpiredEvents, schedulerTimeout, commonStartTime);
     }
 
     /**
@@ -445,8 +444,11 @@ public void start() {
         //Do nothing
     }
 
+    @Override
     public void stop() {
-        //Do nothing
+        if (scheduler != null) {
+            scheduler.stop();
+        }
     }
 
     @Override
@@ -487,15 +489,14 @@ class WindowState extends State {
         private boolean flushed = false;
 
 
-        public WindowState(StreamEventClonerHolder streamEventClonerHolder,
-                           boolean outputExpectsExpiredEvents, long schedulerTimeout, long startTime) {
+        public WindowState(boolean outputExpectsExpiredEvents, long schedulerTimeout, long startTime) {
             this.startTime = startTime;
             if (outputExpectsExpiredEvents || findToBeExecuted) {
-                this.expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
+                this.expiredEventChunk = new ComplexEventChunk<>(false);
             }
             if (schedulerTimeout > 0) {
                 if (expiredEventChunk == null) {
-                    this.expiredEventChunk = new ComplexEventChunk<StreamEvent>(false);
+                    this.expiredEventChunk = new ComplexEventChunk<>(false);
                 }
             }
         }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SessionWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SessionWindowProcessor.java
index 689cb22c39..8391750a45 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SessionWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/SessionWindowProcessor.java
@@ -559,7 +559,9 @@ public void start() {
 
     @Override
     public void stop() {
-        //Do nothing
+        if (scheduler != null) {
+            scheduler.stop();
+        }
     }
 
     @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
index 2e2856baf9..963662b76c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeBatchWindowProcessor.java
@@ -338,7 +338,9 @@ public void start() {
 
     @Override
     public void stop() {
-        //Do nothing
+        if (scheduler != null) {
+            scheduler.stop();
+        }
     }
 
     @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeLengthWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeLengthWindowProcessor.java
index 34ff7e450b..bc5b438be2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeLengthWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeLengthWindowProcessor.java
@@ -206,7 +206,9 @@ public void start() {
 
     @Override
     public void stop() {
-        //Do nothing
+        if (scheduler != null) {
+            scheduler.stop();
+        }
     }
 
     class WindowState extends State {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
index 259d2a0808..901d0d8799 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
@@ -186,7 +186,9 @@ public void start() {
 
     @Override
     public void stop() {
-        //Do nothing
+        if (scheduler != null) {
+            scheduler.stop();
+        }
     }
 
     class WindowState extends State {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregatorExecutor.java
index cd94c05f8e..83f55d25e2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/CountAttributeAggregatorExecutor.java
@@ -114,7 +114,7 @@ class AggregatorState extends State {
 
         @Override
         public boolean canDestroy() {
-            return count == 0;
+            return count == 0L;
         }
 
         @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutor.java
index d8d10f6d56..d1cb69fc1f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/DistinctCountAttributeAggregatorExecutor.java
@@ -144,7 +144,7 @@ class AggregatorState extends State {
 
         @Override
         public boolean canDestroy() {
-            return distinctValues.size() == 0;
+            return distinctValues.isEmpty();
         }
 
         @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
index 4b4716362e..999c446201 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MaxAttributeAggregatorExecutor.java
@@ -91,21 +91,18 @@ protected StateFactory<MaxAggregatorState> init(ExpressionExecutor[] attributeEx
         }
         returnType = attributeExpressionExecutors[0].getReturnType();
         boolean finalTrackFutureStates = trackFutureStates;
-        return new StateFactory<MaxAggregatorState>() {
-            @Override
-            public MaxAggregatorState createNewState() {
-                switch (returnType) {
-                    case FLOAT:
-                        return new MaxAttributeAggregatorStateFloat(finalTrackFutureStates);
-                    case INT:
-                        return new MaxAttributeAggregatorStateInt(finalTrackFutureStates);
-                    case LONG:
-                        return new MaxAttributeAggregatorStateLong(finalTrackFutureStates);
-                    case DOUBLE:
-                        return new MaxAttributeAggregatorStateDouble(finalTrackFutureStates);
-                    default:
-                        throw new OperationNotSupportedException("Max not supported for " + returnType);
-                }
+        return () -> {
+            switch (returnType) {
+                case FLOAT:
+                    return new MaxAttributeAggregatorStateFloat(finalTrackFutureStates);
+                case INT:
+                    return new MaxAttributeAggregatorStateInt(finalTrackFutureStates);
+                case LONG:
+                    return new MaxAttributeAggregatorStateLong(finalTrackFutureStates);
+                case DOUBLE:
+                    return new MaxAttributeAggregatorStateDouble(finalTrackFutureStates);
+                default:
+                    throw new OperationNotSupportedException("Max not supported for " + returnType);
             }
         };
     }
@@ -201,7 +198,7 @@ public Object reset() {
 
         @Override
         public boolean canDestroy() {
-            return (maxDeque == null || maxDeque.size() == 0) && maxValue == null;
+            return (maxDeque == null || maxDeque.isEmpty()) && maxValue == null;
         }
 
         @Override
@@ -277,7 +274,7 @@ public Object reset() {
 
         @Override
         public boolean canDestroy() {
-            return (maxDeque == null || maxDeque.size() == 0) && maxValue == null;
+            return (maxDeque == null || maxDeque.isEmpty()) && maxValue == null;
         }
 
         @Override
@@ -354,7 +351,7 @@ public Object reset() {
 
         @Override
         public boolean canDestroy() {
-            return (maxDeque == null || maxDeque.size() == 0) && maxValue == null;
+            return (maxDeque == null || maxDeque.isEmpty()) && maxValue == null;
         }
 
         @Override
@@ -431,7 +428,7 @@ public Object reset() {
 
         @Override
         public boolean canDestroy() {
-            return (maxDeque == null || maxDeque.size() == 0) && maxValue == null;
+            return (maxDeque == null || maxDeque.isEmpty()) && maxValue == null;
         }
 
         @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
index 3c29a0c098..b714404a9b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/MinAttributeAggregatorExecutor.java
@@ -209,7 +209,7 @@ public Object reset() {
 
         @Override
         public boolean canDestroy() {
-            return (minDeque == null || minDeque.size() == 0) && minValue == null;
+            return (minDeque == null || minDeque.isEmpty()) && minValue == null;
         }
 
         @Override
@@ -291,7 +291,7 @@ public Object reset() {
 
         @Override
         public boolean canDestroy() {
-            return (minDeque == null || minDeque.size() == 0) && minValue == null;
+            return (minDeque == null || minDeque.isEmpty()) && minValue == null;
         }
 
         @Override
@@ -360,7 +360,7 @@ public Object reset() {
 
         @Override
         public boolean canDestroy() {
-            return (minDeque == null || minDeque.size() == 0) && minValue == null;
+            return (minDeque == null || minDeque.isEmpty()) && minValue == null;
         }
 
         @Override
@@ -441,7 +441,7 @@ public Object reset() {
 
         @Override
         public boolean canDestroy() {
-            return (minDeque == null || minDeque.size() == 0) && minValue == null;
+            return (minDeque == null || minDeque.isEmpty()) && minValue == null;
         }
 
         @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregatorExecutor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregatorExecutor.java
index cffe104233..9e2ac663bd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregatorExecutor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/selector/attribute/aggregator/UnionSetAttributeAggregatorExecutor.java
@@ -181,7 +181,7 @@ public AggregatorState(ProcessingMode processingMode, boolean outputExpectsExpir
 
         @Override
         public boolean canDestroy() {
-            return set.size() == 0;
+            return set.isEmpty();
         }
 
         @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
index 0c5d227208..74af4d52ec 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
@@ -56,6 +56,7 @@ public class Scheduler {
     private StreamEventFactory streamEventFactory;
     private LatencyTracker latencyTracker;
     private StateHolder<SchedulerState> stateHolder;
+    private boolean stop;
 
 
     public Scheduler(Schedulable singleThreadEntryValve, SiddhiQueryContext siddhiQueryContext) {
@@ -248,6 +249,10 @@ public void switchToPlayBackMode() {
         }
     }
 
+    public void stop() {
+        stop = true;
+    }
+
     private class EventCaller implements Runnable {
         private SchedulerState state;
         private String key;
@@ -270,6 +275,9 @@ public EventCaller(SchedulerState state, String key) {
          */
         @Override
         public synchronized void run() {
+            if (stop) {
+                return;
+            }
             SiddhiAppContext.startPartitionFlow(key);
             try {
                 if (!siddhiQueryContext.getSiddhiAppContext().isPlayback()) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
index a27b024455..23a8025c48 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
@@ -77,6 +77,8 @@ public final class SiddhiConstants {
     public static final String ANNOTATION_IGNORE_EVENTS_OLDER_THAN_BUFFER = "IgnoreEventsOlderThanBuffer";
     public static final String ANNOTATION_ELEMENT_REF = "ref";
     public static final String ANNOTATION_ELEMENT_ENABLE = "enable";
+    public static final String ANNOTATION_ELEMENT_RETENTION_PERIOD = "retention.period";
+    public static final String ANNOTATION_ELEMENT_INTERVAL = "interval";
     public static final String ANNOTATION_ELEMENT_INCLUDE = "include";
     public static final String ANNOTATION_PARTITION_BY_ID = "PartitionById";
 
@@ -119,8 +121,7 @@ public final class SiddhiConstants {
     public static final String TRANSPORT_CHANNEL_CREATION_IDENTIFIER = "transportChannelCreationEnabled";
 
     public static final String NAMESPACE_PURGE = "purge";
-    public static final String NAMESPACE_RETENTION = "retentionPeriod";
-    public static final String NAMESPACE_INTERVAL = "interval";
+    public static final String NAMESPACE_RETENTION_PERIOD = "retentionPeriod";
 
     public static final String PARTITION_ID_DEFAULT = "null";
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
index 4faf277c2d..88b6c852eb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
@@ -179,7 +179,7 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
             if (enablePartioning || shouldPartitionById) {
                 shardId = configManager.extractProperty("shardId");
                 if (shardId == null) {
-                    throw new SiddhiAppCreationException("Configuration 'shardId' not provided for @partitionbyid " +
+                    throw new SiddhiAppCreationException("Configuration 'shardId' not provided for @partitionById " +
                             "annotation");
                 }
                 enablePartioning = true;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
index feaa1d172d..52ef963870 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/OutputParser.java
@@ -73,7 +73,6 @@
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Class to parse {@link OutputCallback}
@@ -280,10 +279,10 @@ public static OutputCallback constructOutputCallback(OutputStream outStream, Str
         }
     }
 
-    public static OutputRateLimiter constructOutputRateLimiter(String id, OutputRate outputRate, boolean isGroupBy,
-                                                               boolean isWindow, ScheduledExecutorService
-                                                                       scheduledExecutorService, SiddhiQueryContext
-                                                                       siddhiQueryContext) {
+    public static OutputRateLimiter constructOutputRateLimiter(String id, OutputRate outputRate,
+                                                               boolean isGroupBy,
+                                                               boolean isWindow,
+                                                               SiddhiQueryContext siddhiQueryContext) {
         if (outputRate == null) {
             return new PassThroughOutputRateLimiter(id);
         } else if (outputRate instanceof EventOutputRate) {
@@ -309,23 +308,18 @@ public static OutputRateLimiter constructOutputRateLimiter(String id, OutputRate
         } else if (outputRate instanceof TimeOutputRate) {
             switch (((TimeOutputRate) outputRate).getType()) {
                 case ALL:
-                    return new AllPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue(),
-                            scheduledExecutorService);
+                    return new AllPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue());
                 case FIRST:
                     if (isGroupBy) {
-                        return new FirstGroupByPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue(),
-                                scheduledExecutorService);
+                        return new FirstGroupByPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue());
                     } else {
-                        return new FirstPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue(),
-                                scheduledExecutorService);
+                        return new FirstPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue());
                     }
                 case LAST:
                     if (isGroupBy) {
-                        return new LastGroupByPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue(),
-                                scheduledExecutorService);
+                        return new LastGroupByPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue());
                     } else {
-                        return new LastPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue(),
-                                scheduledExecutorService);
+                        return new LastPerTimeOutputRateLimiter(id, ((TimeOutputRate) outputRate).getValue());
                     }
             }
             //never happens
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/PartitionParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/PartitionParser.java
index 10918ac5e7..0943e467b6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/PartitionParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/PartitionParser.java
@@ -68,7 +68,7 @@ public static PartitionRuntime parse(SiddhiAppRuntimeBuilder siddhiAppRuntimeBui
                     siddhiAppRuntimeBuilder.getAggregationMap(),
                     siddhiAppRuntimeBuilder.getWindowMap(),
                     siddhiAppRuntimeBuilder.getLockSynchronizer(),
-                    String.valueOf(queryIndex), true);
+                    String.valueOf(queryIndex), true, partitionRuntime.getPartitionName());
             queryIndex++;
             MetaStateEvent metaStateEvent = createMetaEventForPartitioner(queryRuntime.getMetaComplexEvent());
             partitionRuntime.addQuery(queryRuntime);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/QueryParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/QueryParser.java
index eb2a91f54d..dabf6fe133 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/QueryParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/QueryParser.java
@@ -79,6 +79,7 @@ public class QueryParser {
      * @param lockSynchronizer         Lock synchronizer for sync the lock across queries.
      * @param queryIndex               query index to identify unknown query by number
      * @param partitioned              is the query partitioned
+     * @param partitionId              The ID of the partition
      * @return queryRuntime
      */
     public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
@@ -89,7 +90,7 @@ public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
                                      Map<String, Table> tableMap,
                                      Map<String, AggregationRuntime> aggregationMap, Map<String, Window> windowMap,
                                      LockSynchronizer lockSynchronizer,
-                                     String queryIndex, boolean partitioned) {
+                                     String queryIndex, boolean partitioned, String partitionId) {
         List<VariableExpressionExecutor> executors = new ArrayList<VariableExpressionExecutor>();
         QueryRuntime queryRuntime;
         Element nameElement = null;
@@ -104,7 +105,7 @@ public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
             } else {
                 queryName = "query_" + queryIndex;
             }
-            SiddhiQueryContext siddhiQueryContext = new SiddhiQueryContext(siddhiAppContext, queryName);
+            SiddhiQueryContext siddhiQueryContext = new SiddhiQueryContext(siddhiAppContext, queryName, partitionId);
             siddhiQueryContext.setPartitioned(partitioned);
             latencyTracker = QueryParserHelper.createLatencyTracker(siddhiAppContext, siddhiQueryContext.getName(),
                     SiddhiConstants.METRIC_INFIX_QUERIES, null);
@@ -206,7 +207,7 @@ public static QueryRuntime parse(Query query, SiddhiAppContext siddhiAppContext,
             OutputRateLimiter outputRateLimiter = OutputParser.constructOutputRateLimiter(
                     query.getOutputStream().getId(), query.getOutputRate(),
                     query.getSelector().getGroupByList().size() != 0, isWindow,
-                    siddhiAppContext.getScheduledExecutorService(), siddhiQueryContext);
+                    siddhiQueryContext);
             if (outputRateLimiter instanceof WrappedSnapshotOutputRateLimiter) {
                 selector.setBatchingEnabled(false);
             }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SiddhiAppParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SiddhiAppParser.java
index 4e28a2bcbe..c577a7723f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SiddhiAppParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SiddhiAppParser.java
@@ -258,7 +258,7 @@ public static SiddhiAppRuntimeBuilder parse(SiddhiApp siddhiApp, String siddhiAp
                             siddhiAppRuntimeBuilder.getAggregationMap(),
                             siddhiAppRuntimeBuilder.getWindowMap(),
                             siddhiAppRuntimeBuilder.getLockSynchronizer(),
-                            String.valueOf(queryIndex), false);
+                            String.valueOf(queryIndex), false, SiddhiConstants.PARTITION_ID_DEFAULT);
                     siddhiAppRuntimeBuilder.addQuery(queryRuntime);
                     siddhiAppContext.addEternalReferencedHolder(queryRuntime);
                     queryIndex++;
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionDataPurgingTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionDataPurgingTestCase.java
new file mode 100644
index 0000000000..e6ee53f3e2
--- /dev/null
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionDataPurgingTestCase.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package io.siddhi.core.query.partition;
+
+import io.siddhi.core.SiddhiAppRuntime;
+import io.siddhi.core.SiddhiManager;
+import io.siddhi.core.event.Event;
+import io.siddhi.core.stream.input.InputHandler;
+import io.siddhi.core.stream.output.StreamCallback;
+import io.siddhi.core.util.EventPrinter;
+import io.siddhi.core.util.SiddhiTestHelper;
+import org.apache.log4j.Logger;
+import org.testng.Assert;
+import org.testng.AssertJUnit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class PartitionDataPurgingTestCase {
+    private static final Logger log = Logger.getLogger(PartitionDataPurgingTestCase.class);
+    private AtomicInteger count = new AtomicInteger(0);
+    private int stockStreamEventCount;
+    private boolean eventArrived;
+
+    @BeforeMethod
+    public void init() {
+        count.set(0);
+        eventArrived = false;
+        stockStreamEventCount = 0;
+    }
+
+    @Test
+    public void testPartitionPurgQuery1() throws InterruptedException {
+        log.info("Partition test");
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "@app:name('PartitionTest') " +
+                "" +
+                "define stream streamA (symbol string, price int);" +
+                "" +
+                "" +
+                "@purge(enable='true', interval='1 sec', retention.period='1 sec') " +
+                "partition with (symbol of streamA) " +
+                "begin " +
+                "   @info(name = 'query1') " +
+                "   from streamA#window.length(3) " +
+                "   select symbol, avg(price) as total " +
+                "   insert into StockQuote ;  " +
+                "end ";
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+
+        StreamCallback streamCallback = new StreamCallback() {
+            @Override
+            public void receive(Event[] events) {
+                EventPrinter.print(events);
+                AssertJUnit.assertTrue("IBM".equals(events[0].getData(0)) ||
+                        "WSO2".equals(events[0].getData(0)));
+                for (Event event : events) {
+                    int eventCount = count.incrementAndGet();
+                    switch (eventCount) {
+                        case 1:
+                            Assert.assertEquals(event.getData(1), 100.0);
+                            break;
+                        case 2:
+                            Assert.assertEquals(event.getData(1), 100.0);
+                            break;
+                        case 3:
+                            Assert.assertEquals(event.getData(1), 200.0);
+                            break;
+                        case 4:
+                            Assert.assertEquals(event.getData(1), 40.0);
+                            break;
+                        case 5:
+                            Assert.assertEquals(event.getData(1), 25.0);
+                            break;
+                        case 6:
+                            Assert.assertEquals(event.getData(1), 20.0);
+                            break;
+                        case 7:
+                            Assert.assertEquals(event.getData(1), 100.0);
+                            break;
+                        case 8:
+                            Assert.assertEquals(event.getData(1), 10.0);
+                            break;
+                    }
+
+                }
+                eventArrived = true;
+            }
+        };
+        siddhiAppRuntime.addCallback("StockQuote", streamCallback);
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("streamA");
+        siddhiAppRuntime.start();
+        inputHandler.send(new Object[]{"IBM", 100});
+        inputHandler.send(new Object[]{"IBM", 100});
+        inputHandler.send(new Object[]{"IBM", 400});
+        inputHandler.send(new Object[]{"WSO2", 40});
+        inputHandler.send(new Object[]{"WSO2", 10});
+        inputHandler.send(new Object[]{"WSO2", 10});
+        Thread.sleep(1100);
+        inputHandler.send(new Object[]{"IBM", 100});
+        inputHandler.send(new Object[]{"WSO2", 10});
+
+        SiddhiTestHelper.waitForEvents(100, 8, count, 60000);
+        AssertJUnit.assertTrue(eventArrived);
+        AssertJUnit.assertEquals(8, count.get());
+        siddhiAppRuntime.shutdown();
+    }
+
+}
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/window/TimeBatchWindowTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/window/TimeBatchWindowTestCase.java
index 9572519ff4..9831e0be68 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/window/TimeBatchWindowTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/window/TimeBatchWindowTestCase.java
@@ -362,7 +362,6 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
         siddhiAppRuntime.start();
         // Start sending events in the beginning of a cycle
         while (System.currentTimeMillis() % 2000 != 0) {
-            ;
         }
         inputHandler.send(new Object[]{"IBM", 700f, 0});
         inputHandler.send(new Object[]{"WSO2", 60.5f, 1});
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
index 3038e4ee70..b4ae47cfa8 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/event/EventTestCase.java
@@ -279,7 +279,7 @@ public void testQueryParser() {
         context.setSnapshotService(new SnapshotService(context));
         QueryRuntime runtime = QueryParser.parse(query, context, streamDefinitionMap, tableDefinitionMap,
                 windowDefinitionMap, aggregationDefinitionMap, tableMap, aggregationMap, eventWindowMap,
-                lockSynchronizer, "1", false);
+                lockSynchronizer, "1", false, SiddhiConstants.PARTITION_ID_DEFAULT);
         AssertJUnit.assertNotNull(runtime);
         AssertJUnit.assertTrue(runtime.getStreamRuntime() instanceof SingleStreamRuntime);
         AssertJUnit.assertNotNull(runtime.getSelector());

From 7e7acf4eba4e56fb1e31558dd07d01731214943c Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Fri, 29 Mar 2019 12:18:35 +0530
Subject: [PATCH 15/21] Add Session window test to the build

---
 .../java/io/siddhi/core/window/SessionWindowTestCase.java   | 6 +++---
 modules/siddhi-core/src/test/resources/testng.xml           | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
index a7d0aa34fe..c6cdd9af9b 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
@@ -119,8 +119,8 @@ public void testSessionWindow2() {
 
         } catch (SiddhiAppCreationException e) {
             AssertJUnit.assertEquals("Session window's 1st parameter, session gap should be a constant parameter"
-                    + " attribute but found a dynamic attribute "
-                    + "VariableExpressionExecutor", e.getCause().getMessage());
+                            + " attribute but found a dynamic attribute io.siddhi.core.executor.VariableExpressionExecutor",
+                    e.getCause().getMessage());
             throw e;
         } finally {
             if (siddhiAppRuntime != null) {
@@ -250,7 +250,7 @@ public void testSessionWindow6() {
         } catch (SiddhiAppCreationException e) {
             AssertJUnit.assertEquals("Session window's 3rd parameter, allowedLatency should be a "
                     + "constant parameter attribute but found a dynamic attribute "
-                    + "VariableExpressionExecutor", e.getCause().getMessage());
+                    + "io.siddhi.core.executor.VariableExpressionExecutor", e.getCause().getMessage());
             throw e;
         } finally {
             if (siddhiAppRuntime != null) {
diff --git a/modules/siddhi-core/src/test/resources/testng.xml b/modules/siddhi-core/src/test/resources/testng.xml
index ba0e005924..22a0d02b95 100644
--- a/modules/siddhi-core/src/test/resources/testng.xml
+++ b/modules/siddhi-core/src/test/resources/testng.xml
@@ -123,6 +123,7 @@
             <class name="io.siddhi.core.window.TimeLengthWindowTestCase"/>
             <class name="io.siddhi.core.window.WindowDefinitionTestCase"/>
             <class name="io.siddhi.core.window.BatchWindowTestCase"/>
+            <class name="io.siddhi.core.window.SessionWindowTestCase"/>
 
             <class name="io.siddhi.core.query.BooleanCompareTestCase"/>
             <class name="io.siddhi.core.query.FilterTestCase1"/>

From 39d66771f6eaa11ba76093037b38815068205dad Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Fri, 29 Mar 2019 15:42:36 +0530
Subject: [PATCH 16/21] Add Delay window test to the build

---
 .../src/test/java/io/siddhi/core/window/DelayWindowTestCase.java | 1 +
 modules/siddhi-core/src/test/resources/testng.xml                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/window/DelayWindowTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/window/DelayWindowTestCase.java
index cc83264a32..15e70cd035 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/window/DelayWindowTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/window/DelayWindowTestCase.java
@@ -374,6 +374,7 @@ public void delayWindowTest7() throws InterruptedException {
         siddhiAppRuntime.addCallback("outputStream", new StreamCallback() {
             @Override
             public void receive(Event[] events) {
+                EventPrinter.print(events);
                 count.addAndGet(events.length);
                 for (Event event : events) {
                     AssertJUnit.assertTrue(("IBM".equals(event.getData(0)) || "WSO2".equals(event.getData(0))));
diff --git a/modules/siddhi-core/src/test/resources/testng.xml b/modules/siddhi-core/src/test/resources/testng.xml
index 22a0d02b95..fc7cec5b5a 100644
--- a/modules/siddhi-core/src/test/resources/testng.xml
+++ b/modules/siddhi-core/src/test/resources/testng.xml
@@ -124,6 +124,7 @@
             <class name="io.siddhi.core.window.WindowDefinitionTestCase"/>
             <class name="io.siddhi.core.window.BatchWindowTestCase"/>
             <class name="io.siddhi.core.window.SessionWindowTestCase"/>
+            <class name="io.siddhi.core.window.DelayWindowTestCase"/>
 
             <class name="io.siddhi.core.query.BooleanCompareTestCase"/>
             <class name="io.siddhi.core.query.FilterTestCase1"/>

From 930588b0462ed0aeca521c4849c836296c7cad16 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Fri, 29 Mar 2019 15:44:37 +0530
Subject: [PATCH 17/21] Improve partition creation notification

---
 .../partition/PartitionCreationListener.java  | 30 +++++++++++++++++++
 .../core/partition/PartitionRuntime.java      |  4 +--
 .../partition/PartitionStreamReceiver.java    |  2 +-
 .../io/siddhi/core/query/QueryRuntime.java    | 11 ++++---
 .../state/AbsentLogicalPreStateProcessor.java |  7 +----
 .../stream/state/AbsentPreStateProcessor.java |  4 +--
 .../state/AbsentStreamPreStateProcessor.java  |  7 +----
 .../stream/state/StateStreamRuntime.java      |  8 ++---
 .../output/ratelimit/OutputRateLimiter.java   |  4 +--
 .../PassThroughOutputRateLimiter.java         |  8 ++---
 .../event/AllPerEventOutputRateLimiter.java   |  9 ++----
 ...FirstGroupByPerEventOutputRateLimiter.java |  9 ++----
 .../event/FirstPerEventOutputRateLimiter.java |  9 ++----
 .../LastGroupByPerEventOutputRateLimiter.java |  9 ++----
 .../event/LastPerEventOutputRateLimiter.java  |  9 ++----
 ...yWindowedPerSnapshotOutputRateLimiter.java |  5 ----
 ...nWindowedPerSnapshotOutputRateLimiter.java |  7 +----
 ...yWindowedPerSnapshotOutputRateLimiter.java |  7 +----
 ...gregationPerSnapshotOutputRateLimiter.java |  8 +----
 .../GroupByPerSnapshotOutputRateLimiter.java  |  7 +----
 .../PerSnapshotOutputRateLimiter.java         |  7 +----
 .../snapshot/SnapshotOutputRateLimiter.java   |  4 +--
 .../WindowedPerSnapshotOutputRateLimiter.java |  7 +----
 .../WrappedSnapshotOutputRateLimiter.java     | 10 ++-----
 .../time/AllPerTimeOutputRateLimiter.java     |  7 +----
 .../FirstGroupByPerTimeOutputRateLimiter.java |  7 +----
 .../time/FirstPerTimeOutputRateLimiter.java   |  7 +----
 .../LastGroupByPerTimeOutputRateLimiter.java  |  7 +----
 .../time/LastPerTimeOutputRateLimiter.java    |  7 +----
 .../stream/window/DelayWindowProcessor.java   |  6 ++--
 .../stream/window/TimeWindowProcessor.java    |  8 ++---
 .../java/io/siddhi/core/util/Scheduler.java   |  7 ++++-
 .../core/util/parser/SchedulerParser.java     |  1 +
 .../core/util/snapshot/SnapshotService.java   |  6 ----
 .../core/window/SessionWindowTestCase.java    |  4 +--
 35 files changed, 91 insertions(+), 168 deletions(-)
 create mode 100644 modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionCreationListener.java

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionCreationListener.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionCreationListener.java
new file mode 100644
index 0000000000..14e8151910
--- /dev/null
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionCreationListener.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.siddhi.core.partition;
+
+/**
+ * To notify partition creations
+ */
+public interface PartitionCreationListener {
+
+    /**
+     * Get called when partition is created
+     */
+    void partitionCreated();
+}
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
index bd44a65af1..de5409d94e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
@@ -341,7 +341,7 @@ public void setMemoryUsageTracker(MemoryUsageTracker memoryUsageTracker) {
         }
     }
 
-    public void start() {
+    public void initPartition() {
         PartitionState state = stateHolder.getState();
         try {
             Long time = state.partitionKeys.get(SiddhiAppContext.getPartitionFlowId());
@@ -350,7 +350,7 @@ public void start() {
                     time = state.partitionKeys.get(SiddhiAppContext.getPartitionFlowId());
                     if (time == null) {
                         for (QueryRuntime queryRuntime : queryRuntimeList) {
-                            queryRuntime.start();
+                            queryRuntime.initPartition();
                         }
                     }
                     state.partitionKeys.put(SiddhiAppContext.getPartitionFlowId(),
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
index cedd041bc6..425f707277 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionStreamReceiver.java
@@ -262,7 +262,7 @@ private void send(String key, ComplexEvent event) {
         if (key != null) {
             SiddhiAppContext.startPartitionFlow(key);
             try {
-                partitionRuntime.start();
+                partitionRuntime.initPartition();
                 streamJunctionMap.get(streamId).sendEvent(event);
             } finally {
                 SiddhiAppContext.stopPartitionFlow();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/QueryRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/QueryRuntime.java
index bd5cb979ec..366f329d20 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/QueryRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/QueryRuntime.java
@@ -156,15 +156,18 @@ public QuerySelector getSelector() {
         return selector;
     }
 
-    public void start() {
+    public void initPartition() {
         if (streamRuntime instanceof StateStreamRuntime) {
-            ((StateStreamRuntime) streamRuntime).start();
+            ((StateStreamRuntime) streamRuntime).initPartition();
         }
-        outputRateLimiter.start();
+        outputRateLimiter.partitionCreated();
+    }
+
+    public void start() {
+        initPartition();
     }
 
     @Override
     public void stop() {
-        outputRateLimiter.stop();
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
index 9b0518097a..369fb01148 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentLogicalPreStateProcessor.java
@@ -321,7 +321,7 @@ public void setScheduler(Scheduler scheduler) {
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         StreamPreState state = stateHolder.getState();
         try {
             if (!state.isStarted()) {
@@ -342,11 +342,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     public boolean partnerCanProceed(StateEvent stateEvent) {
         StreamPreState state = stateHolder.getState();
         try {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentPreStateProcessor.java
index 40e5eca75c..1aff0cb3c1 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentPreStateProcessor.java
@@ -18,13 +18,13 @@
 
 package io.siddhi.core.query.input.stream.state;
 
+import io.siddhi.core.partition.PartitionCreationListener;
 import io.siddhi.core.query.processor.SchedulingProcessor;
-import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 
 /**
  * PreStateProcessor of events not received by Siddhi.
  */
-public interface AbsentPreStateProcessor extends SchedulingProcessor, ExternalReferencedHolder {
+public interface AbsentPreStateProcessor extends SchedulingProcessor, PartitionCreationListener {
 
     /**
      * Update the timestamp of the event arrived to this processor and met the filter conditions.
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
index bec4793396..cc53cae38e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/AbsentStreamPreStateProcessor.java
@@ -273,7 +273,7 @@ public void setScheduler(Scheduler scheduler) {
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         // Start automatically only if it is the start state and 'for' time is defined
         // Otherwise, scheduler will be started in the addState method
         LogicalStreamPreState state = (LogicalStreamPreState) stateHolder.getState();
@@ -292,11 +292,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class LogicalStreamPreState extends StreamPreState {
 
         /**
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StateStreamRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StateStreamRuntime.java
index 0f26db3900..c82c7a00c8 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StateStreamRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/input/stream/state/StateStreamRuntime.java
@@ -22,12 +22,12 @@
 import io.siddhi.core.event.MetaComplexEvent;
 import io.siddhi.core.event.state.MetaStateEvent;
 import io.siddhi.core.event.state.StateEvent;
+import io.siddhi.core.partition.PartitionCreationListener;
 import io.siddhi.core.query.input.stream.StreamRuntime;
 import io.siddhi.core.query.input.stream.single.SingleStreamRuntime;
 import io.siddhi.core.query.input.stream.state.runtime.InnerStateRuntime;
 import io.siddhi.core.query.processor.ProcessingMode;
 import io.siddhi.core.query.processor.Processor;
-import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 
 import java.util.List;
 
@@ -81,11 +81,11 @@ public void setStartupPreStateProcessors(List<PreStateProcessor> startupPreState
         this.startupPreStateProcessors = startupPreStateProcessors;
     }
 
-    public void start() {
+    public void initPartition() {
         innerStateRuntime.init();
         for (PreStateProcessor preStateProcessor : startupPreStateProcessors) {
-            if (preStateProcessor instanceof ExternalReferencedHolder) {
-                ((ExternalReferencedHolder) preStateProcessor).start();
+            if (preStateProcessor instanceof PartitionCreationListener) {
+                ((PartitionCreationListener) preStateProcessor).partitionCreated();
             }
         }
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
index da0c2689c6..1b25c16783 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/OutputRateLimiter.java
@@ -20,10 +20,10 @@
 import io.siddhi.core.config.SiddhiQueryContext;
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
+import io.siddhi.core.partition.PartitionCreationListener;
 import io.siddhi.core.query.input.MultiProcessStreamReceiver;
 import io.siddhi.core.query.output.callback.OutputCallback;
 import io.siddhi.core.query.output.callback.QueryCallback;
-import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 import io.siddhi.core.util.lock.LockWrapper;
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateFactory;
@@ -39,7 +39,7 @@
  *
  * @param <S> current state of the RateLimiter
  */
-public abstract class OutputRateLimiter<S extends State> implements ExternalReferencedHolder {
+public abstract class OutputRateLimiter<S extends State> implements PartitionCreationListener {
 
     protected List<QueryCallback> queryCallbacks = new ArrayList<QueryCallback>();
     protected OutputCallback outputCallback = null;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
index 31a0c3eabd..75f1d42ddb 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/PassThroughOutputRateLimiter.java
@@ -45,12 +45,8 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
-        //Nothing to start
+    public void partitionCreated() {
+        //Nothing to be done
     }
 
-    @Override
-    public void stop() {
-        //Nothing to stop
-    }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
index 78c57b6740..88935953dd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
@@ -80,13 +80,8 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
-        //Nothing to start
-    }
-
-    @Override
-    public void stop() {
-        //Nothing to stop
+    public void partitionCreated() {
+        //Nothing to be done
     }
 
     class RateLimiterState extends State {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
index fd4b14f6ef..79e9343ea0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
@@ -90,13 +90,8 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
-        //Nothing to start
-    }
-
-    @Override
-    public void stop() {
-        //Nothing to stop
+    public void partitionCreated() {
+        //Nothing to be done
     }
 
     class RateLimiterState extends State {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
index 121e9c5b3e..02fea5a010 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
@@ -78,13 +78,8 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
-        //Nothing to start
-    }
-
-    @Override
-    public void stop() {
-        //Nothing to stop
+    public void partitionCreated() {
+        //Nothing to be done
     }
 
     class RateLimiterState extends State {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
index ee4db71723..d0f7a037e3 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastGroupByPerEventOutputRateLimiter.java
@@ -87,13 +87,8 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
-        //Nothing to start
-    }
-
-    @Override
-    public void stop() {
-        //Nothing to stop
+    public void partitionCreated() {
+        //Nothing to be done
     }
 
     class RateLimiterState extends State {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastPerEventOutputRateLimiter.java
index d391f7c467..fdc346f5dd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/LastPerEventOutputRateLimiter.java
@@ -74,13 +74,8 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
-        //Nothing to start
-    }
-
-    @Override
-    public void stop() {
-        //Nothing to stop
+    public void partitionCreated() {
+        //Nothing to be done
     }
 
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index 7211d868a3..69cbbf119b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -151,11 +151,6 @@ private void constructOutputChunk(List<ComplexEventChunk<ComplexEvent>> outputEv
         outputEventChunks.add(outputEventChunk);
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class AggregationGroupByRateLimiterState extends AggregationRateLimiterState {
 
         private List<GroupedComplexEvent> eventList;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
index c538e7dd1e..45c83fda5b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AggregationWindowedPerSnapshotOutputRateLimiter.java
@@ -157,7 +157,7 @@ private void tryFlushEvents(ArrayList<ComplexEventChunk<ComplexEvent>> outputEve
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         AggregationRateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -170,11 +170,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class AggregationRateLimiterState extends State {
 
         private List<ComplexEvent> eventList;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
index eb223242f2..e4fa061b24 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationGroupByWindowedPerSnapshotOutputRateLimiter.java
@@ -124,7 +124,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -137,11 +137,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     private class LastEventHolder {
         long count = 0;
         ComplexEvent lastEvent = null;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
index b55b072872..f030d47189 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/AllAggregationPerSnapshotOutputRateLimiter.java
@@ -100,7 +100,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -113,12 +113,6 @@ public void start() {
         }
     }
 
-
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
         public long scheduledTime;
         private ComplexEvent lastEvent = null;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
index 06db7b7d20..a3fe00f7b4 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/GroupByPerSnapshotOutputRateLimiter.java
@@ -106,7 +106,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -119,11 +119,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
         public long scheduledTime;
         private Map<String, ComplexEvent> groupByKeyEvents = new LinkedHashMap<>();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
index 6ee6babd90..dc9464a275 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
@@ -101,7 +101,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -114,11 +114,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
 
         public long scheduledTime;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/SnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/SnapshotOutputRateLimiter.java
index 37d3b460dc..cce558f0bd 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/SnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/SnapshotOutputRateLimiter.java
@@ -88,9 +88,7 @@ protected ComplexEvent cloneComplexEvent(ComplexEvent complexEvent) {
         }
     }
 
-    public abstract void start();
-
-    public abstract void stop();
+    public abstract void partitionCreated();
 
     public void setQueryLock(LockWrapper lockWrapper) {
         this.lockWrapper = lockWrapper;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
index e2eba7d1b7..f8ab7c4e62 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WindowedPerSnapshotOutputRateLimiter.java
@@ -124,7 +124,7 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -137,11 +137,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
 
         private List<ComplexEvent> eventList = new LinkedList<>();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
index e2410fdd0c..9a24f4c33c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/WrappedSnapshotOutputRateLimiter.java
@@ -127,15 +127,9 @@ public void init(int outPutAttributeSize, List<AttributeProcessor> attributeProc
 
     }
 
-
-    @Override
-    public void start() {
-        outputRateLimiter.start();
-    }
-
     @Override
-    public void stop() {
-        outputRateLimiter.stop();
+    public void partitionCreated() {
+        outputRateLimiter.partitionCreated();
     }
 
     @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
index c6324f3329..ddffcad97a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/AllPerTimeOutputRateLimiter.java
@@ -98,7 +98,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -111,11 +111,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
 
         private ComplexEventChunk<ComplexEvent> allComplexEventChunk = new ComplexEventChunk<>(false);
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
index 2f493090da..f6d90ff22c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
@@ -103,7 +103,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -116,11 +116,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
 
         private List<String> groupByKeys = new ArrayList<String>();
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
index e2a8976dd4..426b4468ad 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
@@ -97,7 +97,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -110,11 +110,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
 
         private ComplexEvent firstEvent = null;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
index f057ae0cfa..81b4966d00 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastGroupByPerTimeOutputRateLimiter.java
@@ -102,7 +102,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -115,11 +115,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
 
         public long scheduledTime;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
index 8e5a4f01b0..6fde71057e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/LastPerTimeOutputRateLimiter.java
@@ -95,7 +95,7 @@ public void process(ComplexEventChunk complexEventChunk) {
     }
 
     @Override
-    public void start() {
+    public void partitionCreated() {
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
@@ -108,11 +108,6 @@ public void start() {
         }
     }
 
-    @Override
-    public void stop() {
-        scheduler.stop();
-    }
-
     class RateLimiterState extends State {
 
         private ComplexEvent lastEvent = null;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/DelayWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/DelayWindowProcessor.java
index 8af959f3db..ca5aa9e83b 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/DelayWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/DelayWindowProcessor.java
@@ -116,8 +116,7 @@ protected StateFactory init(ExpressionExecutor[] attributeExpressionExecutors, C
             throw new SiddhiAppValidationException("Delay window should only have one parameter (<int|long|time> " +
                     "delayTime), but found " + attributeExpressionExecutors.length + " input attributes");
         }
-        return () -> new WindowState(streamEventClonerHolder);
-
+        return () -> new DelayedWindowState(streamEventClonerHolder);
     }
 
     @Override
@@ -145,7 +144,6 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
 
                 if (streamEvent.getType() == StreamEvent.Type.CURRENT) {
                     state.delayedEventQueue.add(streamEvent);
-
                     if (state.lastTimestamp < streamEvent.getTimestamp()) {
                         getScheduler().notifyAt(streamEvent.getTimestamp() + delayInMilliSeconds);
                         state.lastTimestamp = streamEvent.getTimestamp();
@@ -191,12 +189,14 @@ class DelayedWindowState extends WindowState {
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("DelayedEventQueue", delayedEventQueue.getSnapshot());
+            state.put("LastTimestamp", lastTimestamp);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
             delayedEventQueue.restore((SnapshotStateList) state.get("DelayedEventQueue"));
+            lastTimestamp = (long) state.get("LastTimestamp");
         }
 
         @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
index 901d0d8799..fe18749c7e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/processor/stream/window/TimeWindowProcessor.java
@@ -186,14 +186,12 @@ public void start() {
 
     @Override
     public void stop() {
-        if (scheduler != null) {
-            scheduler.stop();
-        }
+        //Do nothing
     }
 
     class WindowState extends State {
-        private SnapshotableStreamEventQueue expiredEventQueue;
-        private volatile long lastTimestamp = Long.MIN_VALUE;
+        protected SnapshotableStreamEventQueue expiredEventQueue;
+        protected volatile long lastTimestamp = Long.MIN_VALUE;
 
 
         WindowState(StreamEventClonerHolder streamEventClonerHolder) {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
index 74af4d52ec..19a94bc9b2 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/Scheduler.java
@@ -24,6 +24,7 @@
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.stream.StreamEvent;
 import io.siddhi.core.event.stream.StreamEventFactory;
+import io.siddhi.core.util.extension.holder.ExternalReferencedHolder;
 import io.siddhi.core.util.lock.LockWrapper;
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateHolder;
@@ -43,7 +44,7 @@
 /**
  * Scheduler implementation to take periodic snapshots
  */
-public class Scheduler {
+public class Scheduler implements ExternalReferencedHolder {
 
     private static final Logger log = Logger.getLogger(Scheduler.class);
     private final ThreadBarrier threadBarrier;
@@ -253,6 +254,10 @@ public void stop() {
         stop = true;
     }
 
+    public void start() {
+        stop = false;
+    }
+
     private class EventCaller implements Runnable {
         private SchedulerState state;
         private String key;
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SchedulerParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SchedulerParser.java
index 0cd3671154..9aea41a0e5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SchedulerParser.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/SchedulerParser.java
@@ -42,6 +42,7 @@ public static Scheduler parse(Schedulable singleThreadEntryValve, SiddhiQueryCon
 
         Scheduler scheduler = new Scheduler(singleThreadEntryValve, siddhiQueryContext);
         siddhiQueryContext.getSiddhiAppContext().addScheduler(scheduler);
+        siddhiQueryContext.getSiddhiAppContext().addEternalReferencedHolder(scheduler);
         return scheduler;
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
index c114d64075..f62c059cd9 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
@@ -752,12 +752,6 @@ private void cleanGroupByStates() {
     }
 
     private void waitForSystemStabilization() {
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            throw new SiddhiAppRuntimeException("Stabilization of Siddhi App " + siddhiAppContext.getName() +
-                    " for snapshot/restore interrupted. " + e.getMessage(), e);
-        }
         int retryCount = 100;
         int activeThreads = siddhiAppContext.getThreadBarrier().getActiveThreads();
         while (activeThreads != 0 && retryCount > 0) {
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
index c6cdd9af9b..66822036c7 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/window/SessionWindowTestCase.java
@@ -119,8 +119,8 @@ public void testSessionWindow2() {
 
         } catch (SiddhiAppCreationException e) {
             AssertJUnit.assertEquals("Session window's 1st parameter, session gap should be a constant parameter"
-                            + " attribute but found a dynamic attribute io.siddhi.core.executor.VariableExpressionExecutor",
-                    e.getCause().getMessage());
+                    + " attribute but found a dynamic attribute " +
+                    "io.siddhi.core.executor.VariableExpressionExecutor", e.getCause().getMessage());
             throw e;
         } finally {
             if (siddhiAppRuntime != null) {

From fa6860d07d74106775bce6dd15af00068527f048 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Fri, 29 Mar 2019 18:25:57 +0530
Subject: [PATCH 18/21] Rename partition retention.period to idle.period

Also improve readability of SnapshotService
---
 .../core/partition/PartitionRuntime.java      | 12 +++++-----
 .../io/siddhi/core/util/SiddhiConstants.java  |  2 +-
 .../core/util/snapshot/SnapshotService.java   | 24 +++++++++----------
 .../PartitionDataPurgingTestCase.java         |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
index de5409d94e..46a3d636e6 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/partition/PartitionRuntime.java
@@ -77,7 +77,7 @@ public class PartitionRuntime {
     //default every 5 min
     private long purgeExecutionInterval = 300000;
     private boolean purgingEnabled = false;
-    private long purgeRetentionPeriod = 0;
+    private long purgeIdlePeriod = 0;
     private String partitionName;
     private Partition partition;
     private ConcurrentMap<String, StreamJunction> localStreamJunctionMap = new ConcurrentHashMap<>();
@@ -129,13 +129,13 @@ public PartitionRuntime(ConcurrentMap<String, AbstractDefinition> streamDefiniti
                 throw new SiddhiAppCreationException("Annotation @" + SiddhiConstants.NAMESPACE_PURGE +
                         " is missing element '" + SiddhiConstants.ANNOTATION_ELEMENT_ENABLE + "'");
             }
-            if (purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_RETENTION_PERIOD) != null) {
-                String purgeRetention = purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_RETENTION_PERIOD);
-                purgeRetentionPeriod = Expression.Time.timeToLong(purgeRetention);
+            if (purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_IDLE_PERIOD) != null) {
+                String purgeIdle = purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_IDLE_PERIOD);
+                purgeIdlePeriod = Expression.Time.timeToLong(purgeIdle);
 
             } else {
                 throw new SiddhiAppCreationException("Annotation @" + SiddhiConstants.NAMESPACE_PURGE +
-                        " is missing element '" + SiddhiConstants.ANNOTATION_ELEMENT_RETENTION_PERIOD + "'");
+                        " is missing element '" + SiddhiConstants.ANNOTATION_ELEMENT_IDLE_PERIOD + "'");
             }
 
             if (purge.getElement(SiddhiConstants.ANNOTATION_ELEMENT_INTERVAL) != null) {
@@ -373,7 +373,7 @@ public void run() {
                         synchronized (state) {
                             HashMap<String, Long> partitions = new HashMap<>(state.partitionKeys);
                             for (Map.Entry<String, Long> partition : partitions.entrySet()) {
-                                if (partition.getValue() + purgeRetentionPeriod < currentTime) {
+                                if (partition.getValue() + purgeIdlePeriod < currentTime) {
                                     state.partitionKeys.remove(partition.getKey());
                                     SiddhiAppContext.startPartitionFlow(partition.getKey());
                                     try {
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
index 23a8025c48..ccc1538541 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/SiddhiConstants.java
@@ -77,7 +77,7 @@ public final class SiddhiConstants {
     public static final String ANNOTATION_IGNORE_EVENTS_OLDER_THAN_BUFFER = "IgnoreEventsOlderThanBuffer";
     public static final String ANNOTATION_ELEMENT_REF = "ref";
     public static final String ANNOTATION_ELEMENT_ENABLE = "enable";
-    public static final String ANNOTATION_ELEMENT_RETENTION_PERIOD = "retention.period";
+    public static final String ANNOTATION_ELEMENT_IDLE_PERIOD = "idle.period";
     public static final String ANNOTATION_ELEMENT_INTERVAL = "interval";
     public static final String ANNOTATION_ELEMENT_INCLUDE = "include";
     public static final String ANNOTATION_PARTITION_BY_ID = "PartitionById";
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
index f62c059cd9..abf22de8f5 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/snapshot/SnapshotService.java
@@ -45,8 +45,8 @@
 
 /**
  * Service level implementation to take/restore snapshots of processing elements.
- * Memory   : PartitionId + QueryName + ElementId + PartitionKey + Item
- * Snapshot : PartitionId + PartitionKey + QueryName + ElementId + Item
+ * Memory   : PartitionId + QueryName + ElementId + PartitionGroupByKey + Item
+ * Snapshot : PartitionId + PartitionGroupByKey + QueryName + ElementId + Item
  */
 public class SnapshotService {
     private static final Logger log = Logger.getLogger(SnapshotService.class);
@@ -138,12 +138,12 @@ public byte[] fullSnapshot() {
                                                     partitionIdSnapshot = fullSnapshot.computeIfAbsent(
                                                     partitionIdState.getKey(),
                                                     k -> new HashMap<>());
-                                            Map<String, Map<String, Map<String, Object>>> partitionKeySnapshot =
+                                            Map<String, Map<String, Map<String, Object>>> partitionGroupByKeySnapshot =
                                                     partitionIdSnapshot.computeIfAbsent(
                                                             partitionAndGroupByKey,
                                                             k -> new HashMap<>());
                                             Map<String, Map<String, Object>> querySnapshot =
-                                                    partitionKeySnapshot.computeIfAbsent(
+                                                    partitionGroupByKeySnapshot.computeIfAbsent(
                                                             queryState.getKey(),
                                                             k -> new HashMap<>());
                                             Map<String, Object> elementSnapshot =
@@ -355,10 +355,10 @@ public void restore(byte[] snapshot) throws CannotRestoreSiddhiAppStateException
                     if (partitionStateHolder == null) {
                         continue;
                     }
-                    for (Map.Entry<String, Map<String, Map<String, Map<String, Object>>>> partitionKeySnapshot :
+                    for (Map.Entry<String, Map<String, Map<String, Map<String, Object>>>> partitionGroupByKeySnapshot :
                             partitionIdSnapshot.getValue().entrySet()) {
                         for (Map.Entry<String, Map<String, Map<String, Object>>> querySnapshot :
-                                partitionKeySnapshot.getValue().entrySet()) {
+                                partitionGroupByKeySnapshot.getValue().entrySet()) {
                             ElementStateHolder elementStateHolder =
                                     partitionStateHolder.queryStateHolderMap.get(querySnapshot.getKey());
                             if (elementStateHolder == null) {
@@ -374,8 +374,8 @@ public void restore(byte[] snapshot) throws CannotRestoreSiddhiAppStateException
                                 try {
                                     String partitionKey = null;
                                     String groupByKey = null;
-                                    if (partitionKeySnapshot.getKey() != null) {
-                                        String[] keys = partitionKeySnapshot.getKey().split("--");
+                                    if (partitionGroupByKeySnapshot.getKey() != null) {
+                                        String[] keys = partitionGroupByKeySnapshot.getKey().split("--");
                                         if (keys.length == 2) {
                                             if (!keys[0].equals("null")) {
                                                 partitionKey = keys[0];
@@ -448,8 +448,8 @@ public void restore(Map<String, Map<String, Map<String, Map<Long, Map<Incrementa
                     for (Iterator<Map.Entry<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>>
                          iterator = partitionIdSnapshot.getValue().entrySet().iterator(); iterator.hasNext(); ) {
                         Map.Entry<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>
-                                partitionKeySnapshot = iterator.next();
-                        restoreIncrementalSnapshot(partitionStateHolder, partitionKeySnapshot.getValue());
+                                partitionGroupByKeySnapshot = iterator.next();
+                        restoreIncrementalSnapshot(partitionStateHolder, partitionGroupByKeySnapshot.getValue());
                         iterator.remove();
                     }
 
@@ -675,10 +675,10 @@ public int compare(IncrementalSnapshotInfo o1, IncrementalSnapshotInfo o2) {
                         incrementalState = new HashMap<>();
                 for (IncrementalSnapshotInfo snapshotInfo : incrementalSnapshotInfos) {
                     Map<String, Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>>>
-                            incrementalStateByPartitionKey = incrementalState.computeIfAbsent(
+                            incrementalStateByPartitionGroupByKey = incrementalState.computeIfAbsent(
                             snapshotInfo.getPartitionId(), k -> new TreeMap<>());
                     Map<String, Map<Long, Map<IncrementalSnapshotInfo, byte[]>>> incrementalStateByTime =
-                            incrementalStateByPartitionKey.computeIfAbsent(snapshotInfo.getPartitionGroupByKey(),
+                            incrementalStateByPartitionGroupByKey.computeIfAbsent(snapshotInfo.getPartitionGroupByKey(),
                                     k -> new TreeMap<>());
                     Map<Long, Map<IncrementalSnapshotInfo, byte[]>> idByTime =
                             incrementalStateByTime.computeIfAbsent(snapshotInfo.getId(),
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionDataPurgingTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionDataPurgingTestCase.java
index e6ee53f3e2..7b6f02ef80 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionDataPurgingTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/partition/PartitionDataPurgingTestCase.java
@@ -56,7 +56,7 @@ public void testPartitionPurgQuery1() throws InterruptedException {
                 "define stream streamA (symbol string, price int);" +
                 "" +
                 "" +
-                "@purge(enable='true', interval='1 sec', retention.period='1 sec') " +
+                "@purge(enable='true', interval='1 sec', idle.period='1 sec') " +
                 "partition with (symbol of streamA) " +
                 "begin " +
                 "   @info(name = 'query1') " +

From 706569924c0f6cb567907e18cbec08f6d949dab9 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Sat, 30 Mar 2019 22:52:11 +0530
Subject: [PATCH 19/21] Fix behaviour of "output first every <time>"

Make it to output the first event as soon as it arrives.
---
 .../event/AllPerEventOutputRateLimiter.java   |   1 -
 .../PerSnapshotOutputRateLimiter.java         |  12 +-
 .../FirstGroupByPerTimeOutputRateLimiter.java |  72 ++------
 .../time/FirstPerTimeOutputRateLimiter.java   |  63 ++-----
 .../TimeOutputRateLimitTestCase.java          | 174 ++++++++++++++++++
 5 files changed, 211 insertions(+), 111 deletions(-)

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
index 88935953dd..7f4ad7ad4f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/AllPerEventOutputRateLimiter.java
@@ -36,7 +36,6 @@ public class AllPerEventOutputRateLimiter extends OutputRateLimiter<AllPerEventO
 
     private final Integer value;
 
-
     public AllPerEventOutputRateLimiter(String id, Integer value) {
         this.value = value;
     }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
index dc9464a275..f260ab1f2e 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/snapshot/PerSnapshotOutputRateLimiter.java
@@ -41,7 +41,6 @@
 public class PerSnapshotOutputRateLimiter
         extends SnapshotOutputRateLimiter<PerSnapshotOutputRateLimiter.RateLimiterState> {
     private final Long value;
-    private ComplexEvent lastEvent;
     private Scheduler scheduler;
 
     public PerSnapshotOutputRateLimiter(Long value,
@@ -73,7 +72,7 @@ public void process(ComplexEventChunk complexEventChunk) {
                     } else if (event.getType() == ComplexEvent.Type.CURRENT) {
                         complexEventChunk.remove();
                         tryFlushEvents(outputEventChunks, event, state);
-                        lastEvent = event;
+                        state.lastEvent = event;
                     } else {
                         tryFlushEvents(outputEventChunks, event, state);
                     }
@@ -91,8 +90,8 @@ private void tryFlushEvents(List<ComplexEventChunk<ComplexEvent>> outputEventChu
                                 RateLimiterState state) {
         if (event.getTimestamp() >= state.scheduledTime) {
             ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>(false);
-            if (lastEvent != null) {
-                outputEventChunk.add(cloneComplexEvent(lastEvent));
+            if (state.lastEvent != null) {
+                outputEventChunk.add(cloneComplexEvent(state.lastEvent));
             }
             outputEventChunks.add(outputEventChunk);
             state.scheduledTime += value;
@@ -118,10 +117,11 @@ class RateLimiterState extends State {
 
         public long scheduledTime;
         private ComplexEventChunk<ComplexEvent> eventChunk = new ComplexEventChunk<ComplexEvent>(false);
+        private ComplexEvent lastEvent;
 
         @Override
         public boolean canDestroy() {
-            return eventChunk.getFirst() == null && scheduledTime == 0;
+            return eventChunk.getFirst() == null && scheduledTime == 0 && lastEvent == null;
         }
 
         @Override
@@ -129,6 +129,7 @@ public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
             state.put("EventChunk", eventChunk.getFirst());
             state.put("ScheduledTime", scheduledTime);
+            state.put("LastEvent", lastEvent);
             return state;
         }
 
@@ -137,6 +138,7 @@ public void restore(Map<String, Object> state) {
             eventChunk.clear();
             eventChunk.add((ComplexEvent) state.get("EventList"));
             scheduledTime = (Long) state.get("ScheduledTime");
+            lastEvent = (ComplexEvent) state.get("LastEvent");
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
index f6d90ff22c..944accbc4f 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstGroupByPerTimeOutputRateLimiter.java
@@ -21,18 +21,13 @@
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
 import io.siddhi.core.event.GroupedComplexEvent;
-import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.util.Schedulable;
-import io.siddhi.core.util.Scheduler;
-import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,7 +39,6 @@ public class FirstGroupByPerTimeOutputRateLimiter
     private static final Logger log = Logger.getLogger(FirstGroupByPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private Scheduler scheduler;
 
     public FirstGroupByPerTimeOutputRateLimiter(String id, Long value) {
         this.id = id;
@@ -53,95 +47,61 @@ public FirstGroupByPerTimeOutputRateLimiter(String id, Long value) {
 
     @Override
     protected StateFactory<RateLimiterState> init() {
-        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
-        ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
+        ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<>(complexEventChunk.isBatch());
         complexEventChunk.reset();
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
+                long currentTime = siddhiQueryContext.getSiddhiAppContext().
+                        getTimestampGenerator().currentTime();
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
-                    if (event.getType() == ComplexEvent.Type.TIMER) {
-                        if (event.getTimestamp() >= state.scheduledTime) {
-                            if (state.allComplexEventChunk.getFirst() != null) {
-                                ComplexEventChunk<ComplexEvent> eventChunk = new ComplexEventChunk<ComplexEvent>
-                                        (complexEventChunk.isBatch());
-                                eventChunk.add(state.allComplexEventChunk.getFirst());
-                                state.allComplexEventChunk.clear();
-                                state.groupByKeys.clear();
-                                outputEventChunks.add(eventChunk);
-                            } else {
-                                state.groupByKeys.clear();
-                            }
-                            state.scheduledTime = state.scheduledTime + value;
-                            scheduler.notifyAt(state.scheduledTime);
-                        }
-                    } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
-                            .EXPIRED) {
-                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                        if (!state.groupByKeys.contains(groupedComplexEvent.getGroupKey())) {
-                            complexEventChunk.remove();
-                            state.groupByKeys.add(groupedComplexEvent.getGroupKey());
-                            state.allComplexEventChunk.add(groupedComplexEvent.getComplexEvent());
-                        }
+                    complexEventChunk.remove();
+                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                    Long outputTime = state.groupByOutputTime.get(groupedComplexEvent.getGroupKey());
+                    if (outputTime == null || outputTime + value <= currentTime) {
+                        state.groupByOutputTime.put(groupedComplexEvent.getGroupKey(), currentTime);
+                        outputEventChunk.add(groupedComplexEvent);
                     }
                 }
             }
         } finally {
             stateHolder.returnState(state);
         }
-        for (ComplexEventChunk eventChunk : outputEventChunks) {
-            sendToCallBacks(eventChunk);
+        if (outputEventChunk.getFirst() != null) {
+            sendToCallBacks(outputEventChunk);
         }
     }
 
     @Override
     public void partitionCreated() {
-        RateLimiterState state = stateHolder.getState();
-        try {
-            synchronized (state) {
-                long currentTime = System.currentTimeMillis();
-                state.scheduledTime = currentTime + value;
-                scheduler.notifyAt(state.scheduledTime);
-            }
-        } finally {
-            stateHolder.returnState(state);
-        }
+
     }
 
     class RateLimiterState extends State {
 
-        private List<String> groupByKeys = new ArrayList<String>();
-        private ComplexEventChunk<ComplexEvent> allComplexEventChunk = new ComplexEventChunk<>(false);
-        private long scheduledTime;
+        private Map<String, Long> groupByOutputTime = new HashMap();
 
         @Override
         public boolean canDestroy() {
-            return groupByKeys.size() == 0 && scheduledTime == 0;
+            return groupByOutputTime.isEmpty();
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
-            state.put("GroupByKeys", groupByKeys);
-            state.put("ScheduledTime", scheduledTime);
+            state.put("GroupByOutputTime", groupByOutputTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
-            allComplexEventChunk.clear();
-            allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
-            groupByKeys = (List<String>) state.get("GroupByKeys");
-            scheduledTime = (Long) state.get("ScheduledTime");
+            groupByOutputTime = (Map<String, Long>) state.get("GroupByOutputTime");
         }
     }
 }
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
index 426b4468ad..5e662aa5c0 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
@@ -20,16 +20,12 @@
 
 import io.siddhi.core.event.ComplexEvent;
 import io.siddhi.core.event.ComplexEventChunk;
-import io.siddhi.core.event.stream.StreamEventFactory;
 import io.siddhi.core.query.output.ratelimit.OutputRateLimiter;
 import io.siddhi.core.util.Schedulable;
-import io.siddhi.core.util.Scheduler;
-import io.siddhi.core.util.parser.SchedulerParser;
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateFactory;
 import org.apache.log4j.Logger;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,8 +38,6 @@ public class FirstPerTimeOutputRateLimiter
     private static final Logger log = Logger.getLogger(FirstPerTimeOutputRateLimiter.class);
     private final Long value;
     private String id;
-    private ComplexEvent firstEvent = null;
-    private Scheduler scheduler;
 
     public FirstPerTimeOutputRateLimiter(String id, Long value) {
         this.id = id;
@@ -52,86 +46,57 @@ public FirstPerTimeOutputRateLimiter(String id, Long value) {
 
     @Override
     protected StateFactory<RateLimiterState> init() {
-        this.scheduler = SchedulerParser.parse(this, siddhiQueryContext);
-        this.scheduler.setStreamEventFactory(new StreamEventFactory(0, 0, 0));
-        this.scheduler.init(lockWrapper, siddhiQueryContext.getName());
         return () -> new RateLimiterState();
     }
 
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
-        ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
+        ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<>(complexEventChunk.isBatch());
         complexEventChunk.reset();
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
-                while (complexEventChunk.hasNext()) {
+                long currentTime = siddhiQueryContext.getSiddhiAppContext().
+                        getTimestampGenerator().currentTime();
+                if (state.outputTime == null || state.outputTime + value <= currentTime) {
+                    state.outputTime = currentTime;
                     ComplexEvent event = complexEventChunk.next();
-                    if (event.getType() == ComplexEvent.Type.TIMER) {
-                        if (event.getTimestamp() >= state.scheduledTime) {
-                            if (firstEvent != null) {
-                                firstEvent = null;
-                            }
-                            state.scheduledTime += value;
-                            scheduler.notifyAt(state.scheduledTime);
-                        }
-                    } else if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type
-                            .EXPIRED) {
-                        if (firstEvent == null) {
-                            complexEventChunk.remove();
-                            firstEvent = event;
-                            ComplexEventChunk<ComplexEvent> firstPerEventChunk = new ComplexEventChunk<ComplexEvent>
-                                    (complexEventChunk.isBatch());
-                            firstPerEventChunk.add(event);
-                            outputEventChunks.add(firstPerEventChunk);
-                        }
-                    }
+                    complexEventChunk.remove();
+                    outputEventChunk.add(event);
                 }
             }
         } finally {
             stateHolder.returnState(state);
         }
-        for (ComplexEventChunk eventChunk : outputEventChunks) {
-            sendToCallBacks(eventChunk);
+        if (outputEventChunk.getFirst() != null) {
+            sendToCallBacks(outputEventChunk);
         }
     }
 
     @Override
     public void partitionCreated() {
-        RateLimiterState state = stateHolder.getState();
-        try {
-            synchronized (state) {
-                long currentTime = System.currentTimeMillis();
-                state.scheduledTime = currentTime + value;
-                scheduler.notifyAt(state.scheduledTime);
-            }
-        } finally {
-            stateHolder.returnState(state);
-        }
+
     }
 
     class RateLimiterState extends State {
 
-        private ComplexEvent firstEvent = null;
-        private long scheduledTime;
+        private Long outputTime;
 
         @Override
         public boolean canDestroy() {
-            return firstEvent == null && scheduledTime == 0;
+            return outputTime == null;
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            state.put("FirstEvent", firstEvent);
-            state.put("ScheduledTime", scheduledTime);
+            state.put("ScheduledTime", outputTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
-            firstEvent = (ComplexEvent) state.get("FirstEvent");
-            scheduledTime = (Long) state.get("ScheduledTime");
+            outputTime = (Long) state.get("ScheduledTime");
         }
     }
 
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
index e5af4802bd..d1521e0f16 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
@@ -872,4 +872,178 @@ public void receive(Event[] events) {
 
     }
 
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery14")
+    public void testTimeOutputRateLimitQuery15() throws InterruptedException {
+        log.info("TimeOutputRateLimit test15");
+
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "@app:name('EventOutputRateLimitTest15') " +
+                "" +
+                "define stream LoginEvents (timestamp long, ip string);" +
+                "" +
+                "@info(name = 'query1') " +
+                "from LoginEvents " +
+                "select ip, count(*) as total " +
+                "output first every 1 sec " +
+                "insert all events into uniqueIps ;";
+
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+
+        log.info("Running : " + siddhiAppRuntime.getName());
+
+        siddhiAppRuntime.addCallback("query1", new QueryCallback() {
+            @Override
+            public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
+                EventPrinter.print(timestamp, inEvents, removeEvents);
+                if (inEvents != null) {
+                    inEventCount.addAndGet(inEvents.length);
+                }
+                if (removeEvents != null) {
+                    removeEventCount.addAndGet(removeEvents.length);
+                }
+                eventArrived.set(true);
+            }
+
+        });
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("LoginEvents");
+
+        siddhiAppRuntime.start();
+
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.3"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.9"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+
+        AssertJUnit.assertEquals("Event arrived", true, eventArrived.get());
+        AssertJUnit.assertEquals("Number of output in event value", 1, inEventCount.get());
+        AssertJUnit.assertEquals("Number of output remove event value", 0, removeEventCount.get());
+
+        siddhiAppRuntime.shutdown();
+
+    }
+
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery15")
+    public void testTimeOutputRateLimitQuery16() throws InterruptedException {
+        log.info("TimeOutputRateLimit test16");
+
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "@app:name('EventOutputRateLimitTest16') " +
+                "" +
+                "define stream LoginEvents (timestamp long, ip string);" +
+                "" +
+                "@info(name = 'query1') " +
+                "from LoginEvents " +
+                "select ip, count(*) as total " +
+                "group by ip " +
+                "output first every 1 sec " +
+                "insert all events into uniqueIps ;";
+
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+
+        log.info("Running : " + siddhiAppRuntime.getName());
+
+        siddhiAppRuntime.addCallback("query1", new QueryCallback() {
+            @Override
+            public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
+                EventPrinter.print(timestamp, inEvents, removeEvents);
+                if (inEvents != null) {
+                    inEventCount.addAndGet(inEvents.length);
+                }
+                if (removeEvents != null) {
+                    removeEventCount.addAndGet(removeEvents.length);
+                }
+                eventArrived.set(true);
+            }
+
+        });
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("LoginEvents");
+
+        siddhiAppRuntime.start();
+
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.3"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.9"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+
+        AssertJUnit.assertEquals("Event arrived", true, eventArrived.get());
+        AssertJUnit.assertEquals("Number of output in event value", 4, inEventCount.get());
+        AssertJUnit.assertEquals("Number of output remove event value", 0, removeEventCount.get());
+
+        siddhiAppRuntime.shutdown();
+
+    }
+
+    @Test//(dependsOnMethods = "testTimeOutputRateLimitQuery16")
+    public void testTimeOutputRateLimitQuery17() throws InterruptedException {
+        log.info("TimeOutputRateLimit test17");
+
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "@app:name('EventOutputRateLimitTest11') " +
+                "" +
+                "define stream LoginEvents (timestamp long, ip string);" +
+                "" +
+                "@info(name = 'query1') " +
+                "from LoginEvents#window.lengthBatch(2) " +
+                "select ip, count(*) as total " +
+                "group by ip " +
+                "output first every 1 sec " +
+                "insert into uniqueIps ;";
+
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+
+        log.info("Running : " + siddhiAppRuntime.getName());
+
+        siddhiAppRuntime.addCallback("query1", new QueryCallback() {
+            @Override
+            public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
+                EventPrinter.print(timestamp, inEvents, removeEvents);
+                if (inEvents != null) {
+                    inEventCount.addAndGet(inEvents.length);
+                }
+                if (removeEvents != null) {
+                    removeEventCount.addAndGet(removeEvents.length);
+                }
+                eventArrived.set(true);
+            }
+
+        });
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("LoginEvents");
+
+        siddhiAppRuntime.start();
+
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.3"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.9"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+        Thread.sleep(1100);
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.30"});
+        Thread.sleep(1100);
+
+        AssertJUnit.assertEquals("Event arrived", true, eventArrived.get());
+        AssertJUnit.assertEquals("Number of output in event value", 6, inEventCount.get());
+        AssertJUnit.assertEquals("Number of output remove event value", 0, removeEventCount.get());
+
+        siddhiAppRuntime.shutdown();
+
+    }
+
+
+
 }

From 61ab808e513b3b735914e16eecd57d802b9b8bf4 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Sun, 31 Mar 2019 23:40:01 +0530
Subject: [PATCH 20/21] Fix behaviour of "output first every"

Make it to output the first event as soon as it arrives.
---
 ...FirstGroupByPerEventOutputRateLimiter.java |  56 +++-----
 .../event/FirstPerEventOutputRateLimiter.java |  25 ++--
 .../time/FirstPerTimeOutputRateLimiter.java   |   4 +-
 .../EventOutputRateLimitTestCase.java         | 124 +++++++++++++++++-
 .../TimeOutputRateLimitTestCase.java          |   2 +-
 5 files changed, 151 insertions(+), 60 deletions(-)

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
index 79e9343ea0..dd3019013a 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstGroupByPerEventOutputRateLimiter.java
@@ -25,9 +25,7 @@
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateFactory;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -50,42 +48,30 @@ protected StateFactory<RateLimiterState> init() {
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
-        ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
+        ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<>(complexEventChunk.isBatch());
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
-                    if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
-                        complexEventChunk.remove();
-                        GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
-                        if (!state.groupByKeys.contains(groupedComplexEvent.getGroupKey())) {
-                            state.groupByKeys.add(groupedComplexEvent.getGroupKey());
-                            state.allComplexEventChunk.add(groupedComplexEvent.getComplexEvent());
-                        }
-                        if (++state.counter == value) {
-                            if (state.allComplexEventChunk.getFirst() != null) {
-                                ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<ComplexEvent>
-                                        (complexEventChunk.isBatch());
-                                outputEventChunk.add(state.allComplexEventChunk.getFirst());
-                                outputEventChunks.add(outputEventChunk);
-                                state.allComplexEventChunk.clear();
-                                state.counter = 0;
-                                state.groupByKeys.clear();
-                            } else {
-                                state.counter = 0;
-                                state.groupByKeys.clear();
-                            }
-
-                        }
+                    complexEventChunk.remove();
+                    GroupedComplexEvent groupedComplexEvent = ((GroupedComplexEvent) event);
+                    Integer count = state.groupByOutputTime.get(groupedComplexEvent.getGroupKey());
+                    if (count == null) {
+                        state.groupByOutputTime.put(groupedComplexEvent.getGroupKey(), 1);
+                        outputEventChunk.add(groupedComplexEvent);
+                    } else if (count.equals(value - 1)) {
+                        state.groupByOutputTime.remove(groupedComplexEvent.getGroupKey());
+                    } else {
+                        state.groupByOutputTime.put(groupedComplexEvent.getGroupKey(), count + 1);
                     }
                 }
             }
         } finally {
             stateHolder.returnState(state);
         }
-        for (ComplexEventChunk eventChunk : outputEventChunks) {
-            sendToCallBacks(eventChunk);
+        if (outputEventChunk.getFirst() != null) {
+            sendToCallBacks(outputEventChunk);
         }
     }
 
@@ -95,31 +81,23 @@ public void partitionCreated() {
     }
 
     class RateLimiterState extends State {
-        private List<String> groupByKeys = new ArrayList<String>();
-        private ComplexEventChunk<ComplexEvent> allComplexEventChunk = new ComplexEventChunk<ComplexEvent>(false);
-
-        private volatile int counter = 0;
+        private Map<String, Integer> groupByOutputTime = new HashMap();
 
         @Override
         public boolean canDestroy() {
-            return counter == 0 && groupByKeys.isEmpty();
+            return groupByOutputTime.isEmpty();
         }
 
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            state.put("Counter", counter);
-            state.put("GroupByKeys", groupByKeys);
-            state.put("AllComplexEventChunk", allComplexEventChunk.getFirst());
+            state.put("GroupByOutputTime", groupByOutputTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
-            counter = (int) state.get("Counter");
-            groupByKeys = (List<String>) state.get("GroupByKeys");
-            allComplexEventChunk.clear();
-            allComplexEventChunk.add((ComplexEvent) state.get("AllComplexEventChunk"));
+            groupByOutputTime = (Map<String, Integer>) state.get("GroupByOutputTime");
         }
     }
 
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
index 02fea5a010..82c827e21c 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/event/FirstPerEventOutputRateLimiter.java
@@ -24,7 +24,6 @@
 import io.siddhi.core.util.snapshot.state.State;
 import io.siddhi.core.util.snapshot.state.StateFactory;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -48,33 +47,27 @@ protected StateFactory<RateLimiterState> init() {
     @Override
     public void process(ComplexEventChunk complexEventChunk) {
         complexEventChunk.reset();
-        ArrayList<ComplexEventChunk<ComplexEvent>> outputEventChunks = new ArrayList<ComplexEventChunk<ComplexEvent>>();
+        ComplexEventChunk<ComplexEvent> outputEventChunk = new ComplexEventChunk<>(complexEventChunk.isBatch());
         RateLimiterState state = stateHolder.getState();
         try {
             synchronized (state) {
                 while (complexEventChunk.hasNext()) {
                     ComplexEvent event = complexEventChunk.next();
-                    if (event.getType() == ComplexEvent.Type.CURRENT || event.getType() == ComplexEvent.Type.EXPIRED) {
-                        if (state.counter == 0) {
-                            complexEventChunk.remove();
-                            ComplexEventChunk<ComplexEvent> firstPerEventChunk = new ComplexEventChunk<ComplexEvent>
-                                    (complexEventChunk.isBatch());
-                            firstPerEventChunk.add(event);
-                            outputEventChunks.add(firstPerEventChunk);
-                        }
-                        if (++state.counter == value) {
-                            state.counter = 0;
-                        }
+                    complexEventChunk.remove();
+                    state.counter++;
+                    if (state.counter == 1) {
+                        outputEventChunk.add(event);
+                    } else if (state.counter == value) {
+                        state.counter = 0;
                     }
                 }
             }
         } finally {
             stateHolder.returnState(state);
         }
-        for (ComplexEventChunk eventChunk : outputEventChunks) {
-            sendToCallBacks(eventChunk);
+        if (outputEventChunk.getFirst() != null) {
+            sendToCallBacks(outputEventChunk);
         }
-
     }
 
     @Override
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
index 5e662aa5c0..6550846200 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/query/output/ratelimit/time/FirstPerTimeOutputRateLimiter.java
@@ -90,13 +90,13 @@ public boolean canDestroy() {
         @Override
         public Map<String, Object> snapshot() {
             Map<String, Object> state = new HashMap<>();
-            state.put("ScheduledTime", outputTime);
+            state.put("OutputTime", outputTime);
             return state;
         }
 
         @Override
         public void restore(Map<String, Object> state) {
-            outputTime = (Long) state.get("ScheduledTime");
+            outputTime = (Long) state.get("OutputTime");
         }
     }
 
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/EventOutputRateLimitTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/EventOutputRateLimitTestCase.java
index f16104e48b..238e64dba4 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/EventOutputRateLimitTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/EventOutputRateLimitTestCase.java
@@ -26,6 +26,7 @@
 import io.siddhi.core.stream.input.InputHandler;
 import io.siddhi.core.util.EventPrinter;
 import org.apache.log4j.Logger;
+import org.testng.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -470,7 +471,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
         Thread.sleep(1000);
 
         AssertJUnit.assertEquals("Event arrived", true, eventArrived);
-        AssertJUnit.assertEquals("Number of output event value", 4, count);
+        AssertJUnit.assertEquals("Number of output event value", 5, count);
         siddhiAppRuntime.shutdown();
     }
 
@@ -584,7 +585,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
         Thread.sleep(1000);
 
         AssertJUnit.assertEquals("Event arrived", true, eventArrived);
-        AssertJUnit.assertEquals("Number of output event value", 6, count);
+        AssertJUnit.assertEquals("Number of output event value", 5, count);
         siddhiAppRuntime.shutdown();
     }
 
@@ -945,4 +946,123 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
         siddhiAppRuntime.shutdown();
     }
+
+    @Test
+    public void testEventOutputRateLimitQuery17() throws InterruptedException {
+        log.info("EventOutputRateLimit test17");
+
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "@app:name('EventOutputRateLimitTest8') " +
+                "" +
+                "define stream LoginEvents (timestamp long, ip string);" +
+                "" +
+                "@info(name = 'query1') " +
+                "from LoginEvents " +
+                "select ip " +
+                "group by ip " +
+                "output first every 2 events " +
+                "insert into uniqueIps ;";
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+
+        log.info("Running : " + siddhiAppRuntime.getName());
+
+        siddhiAppRuntime.addCallback("query1", new QueryCallback() {
+            @Override
+            public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
+                EventPrinter.print(timestamp, inEvents, removeEvents);
+                if (inEvents != null) {
+                    count += inEvents.length;
+                } else {
+                    AssertJUnit.fail("Remove events emitted");
+                }
+                eventArrived = true;
+            }
+
+        });
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("LoginEvents");
+
+        siddhiAppRuntime.start();
+
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.3"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.9"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.30"});
+        Thread.sleep(1000);
+
+        AssertJUnit.assertEquals("Event arrived", true, eventArrived);
+        AssertJUnit.assertEquals("Number of output event value", 8, count);
+        siddhiAppRuntime.shutdown();
+    }
+
+    @Test
+    public void testEventOutputRateLimitQuery18() throws InterruptedException {
+        log.info("EventOutputRateLimit test18");
+
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String siddhiApp = "" +
+                "@app:name('EventOutputRateLimitTest8') " +
+                "" +
+                "define stream LoginEvents (timestamp long, ip string);" +
+                "" +
+                "@info(name = 'query1') " +
+                "from LoginEvents " +
+                "select ip " +
+                "output first every 2 events " +
+                "insert into uniqueIps ;";
+
+        SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+
+        log.info("Running : " + siddhiAppRuntime.getName());
+
+        siddhiAppRuntime.addCallback("query1", new QueryCallback() {
+            @Override
+            public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
+                EventPrinter.print(timestamp, inEvents, removeEvents);
+                if (inEvents != null) {
+                    count += inEvents.length;
+                    for (Event event : inEvents) {
+                        Assert.assertTrue(event.getData(0).equals("192.10.1.5") ||
+                                event.getData(0).equals("192.10.1.4"));
+                    }
+                } else {
+                    AssertJUnit.fail("Remove events emitted");
+                }
+                eventArrived = true;
+            }
+
+        });
+
+        InputHandler inputHandler = siddhiAppRuntime.getInputHandler("LoginEvents");
+
+        siddhiAppRuntime.start();
+
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.3"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.9"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.4"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.30"});
+        inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5"});
+        Thread.sleep(1000);
+
+        AssertJUnit.assertEquals("Event arrived", true, eventArrived);
+        AssertJUnit.assertEquals("Number of output event value", 6, count);
+        siddhiAppRuntime.shutdown();
+    }
 }
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
index d1521e0f16..fcce8c00f9 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/TimeOutputRateLimitTestCase.java
@@ -983,7 +983,7 @@ public void receive(long timestamp, Event[] inEvents, Event[] removeEvents) {
 
     }
 
-    @Test//(dependsOnMethods = "testTimeOutputRateLimitQuery16")
+    @Test(dependsOnMethods = "testTimeOutputRateLimitQuery16")
     public void testTimeOutputRateLimitQuery17() throws InterruptedException {
         log.info("TimeOutputRateLimit test17");
 

From 0f5ee5f76f4bb098a993ce0f99c92daf6fe2d1b3 Mon Sep 17 00:00:00 2001
From: Suhothayan <suhothayan@gmail.com>
Date: Mon, 1 Apr 2019 13:36:36 +0530
Subject: [PATCH 21/21] Fix test by increasing wait time.

---
 .../core/query/ratelimit/SnapshotOutputRateLimitTestCase.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/SnapshotOutputRateLimitTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/SnapshotOutputRateLimitTestCase.java
index 345a8892b6..ee6850b19a 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/SnapshotOutputRateLimitTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/query/ratelimit/SnapshotOutputRateLimitTestCase.java
@@ -497,7 +497,7 @@ public void receive(Event[] events) {
         Thread.sleep(1100);
         inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5", 3});
         inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.3", 6});
-        Thread.sleep(2200);
+        Thread.sleep(2300);
         inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.5", 2});
         inputHandler.send(new Object[]{System.currentTimeMillis(), "192.10.1.3", 10});
         Thread.sleep(7200);