diff --git a/src/main/java/com/lambdaworks/redis/output/MapScanResult.java b/src/main/java/com/lambdaworks/redis/output/MapScanResult.java
deleted file mode 100644
index 0c1ff9172..000000000
--- a/src/main/java/com/lambdaworks/redis/output/MapScanResult.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.lambdaworks.redis.output;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class MapScanResult<K, V> {
-
-    private Long pos;
-    private K lastKey;
-    private Map<K, V> values = new LinkedHashMap<K, V>();
-    
-    public void setPos(Long pos) {
-        this.pos = pos;
-    }
-    public Long getPos() {
-        return pos;
-    }
-    
-    public void addKey(K key) {
-        lastKey = key;
-    }
-    
-    public void addValue(V value) {
-        values.put(lastKey, value);
-    }
-    public Map<K, V> getMap() {
-        return values;
-    }
-    
-}
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java b/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java
new file mode 100644
index 000000000..cbe05a73f
--- /dev/null
+++ b/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java
@@ -0,0 +1,23 @@
+package org.redisson.client.protocol.decoder;
+
+import java.util.List;
+
+public class ListScanResult<V> {
+
+    private final Long pos;
+    private final List<V> values;
+
+    public ListScanResult(Long pos, List<V> values) {
+        this.pos = pos;
+        this.values = values;
+    }
+
+    public Long getPos() {
+        return pos;
+    }
+
+    public List<V> getValues() {
+        return values;
+    }
+
+}
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java b/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java
new file mode 100644
index 000000000..5a4b29f32
--- /dev/null
+++ b/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java
@@ -0,0 +1,25 @@
+package org.redisson.client.protocol.decoder;
+
+import java.util.List;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+
+public class ListScanResultReplayDecoder implements MultiDecoder<ListScanResult<Object>> {
+
+    @Override
+    public Object decode(ByteBuf buf) {
+        return Long.valueOf(buf.toString(CharsetUtil.UTF_8));
+    }
+
+    @Override
+    public ListScanResult<Object> decode(List<Object> parts) {
+        return new ListScanResult<Object>((Long)parts.get(0), (List<Object>)parts.get(1));
+    }
+
+    @Override
+    public boolean isApplicable(int paramNum) {
+        return paramNum == 0;
+    }
+
+}
diff --git a/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java b/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java
new file mode 100644
index 000000000..8e5fbb6f4
--- /dev/null
+++ b/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java
@@ -0,0 +1,24 @@
+package org.redisson.client.protocol.decoder;
+
+import java.util.Map;
+
+public class MapScanResult<K, V> {
+
+    private final Long pos;
+    private final Map<K, V> values;
+
+    public MapScanResult(Long pos, Map<K, V> values) {
+        super();
+        this.pos = pos;
+        this.values = values;
+    }
+
+    public Long getPos() {
+        return pos;
+    }
+
+    public Map<K, V> getMap() {
+        return values;
+    }
+
+}
diff --git a/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java b/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java
index 6018816c2..03ce082f2 100644
--- a/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java
+++ b/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java
@@ -3,8 +3,6 @@ package org.redisson.client.protocol.decoder;
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.output.MapScanResult;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.util.CharsetUtil;