diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java
index 2775585f..c57b528e 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java
@@ -1,7 +1,7 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeMap;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
 
@@ -12,7 +12,7 @@ import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
 class ConnAckDecoder extends DemuxDecoder {
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         in.resetReaderIndex();
         //Common decoding part
         ConnAckMessage message = new ConnAckMessage();
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
index bc7760dc..e79658d2 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
@@ -37,11 +37,6 @@ public class ConnectDecoder extends DemuxDecoder {
     static final AttributeKey<Boolean> CONNECT_STATUS = new AttributeKey<Boolean>("connected");
     
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
-        decode((AttributeMap)ctx, in, out);
-    }
-
-//    @Override
     void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
         in.resetReaderIndex();
         //Common decoding part
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java
index f4eba67c..e422af4d 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java
@@ -16,8 +16,8 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.util.AttributeMap;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
 
@@ -26,7 +26,7 @@ import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
  * @author andrea
  */
 abstract class DemuxDecoder {
-    abstract void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception;
+    abstract void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception;
     
     /**
      * Decodes the first 2 bytes of the MQTT packet.
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java
index 8bf8cd9f..90f6757a 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java
@@ -16,7 +16,7 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeMap;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
 
@@ -27,7 +27,7 @@ import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
 class DisconnectDecoder extends DemuxDecoder {
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         //Common decoding part
         in.resetReaderIndex();
         DisconnectMessage message = new DisconnectMessage();
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java
index 650f1f53..3af7ec68 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java
@@ -16,7 +16,7 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeMap;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
 
@@ -29,7 +29,7 @@ abstract class MessageIDDecoder extends DemuxDecoder {
     protected abstract MessageIDMessage createMessage();
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         in.resetReaderIndex();
         //Common decoding part
         MessageIDMessage message = createMessage();
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java
index ddb1c4ab..87dcf8f1 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java
@@ -16,7 +16,7 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeMap;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
 
@@ -27,7 +27,7 @@ import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
 class PingReqDecoder extends DemuxDecoder {
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         //Common decoding part
         in.resetReaderIndex();
         PingReqMessage message = new PingReqMessage();
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java
index 54b6cf74..8ee6c3fe 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java
@@ -16,7 +16,7 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeMap;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
 
@@ -27,7 +27,7 @@ import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
 class PingRespDecoder extends DemuxDecoder {
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         //Common decoding part
         in.resetReaderIndex();
         PingRespMessage message = new PingRespMessage();
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java
index 509c6fd7..934fe6b6 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java
@@ -16,7 +16,6 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
@@ -30,11 +29,6 @@ import org.dna.mqtt.moquette.proto.messages.PubRelMessage;
 class PubRelDecoder extends DemuxDecoder {
     
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
-        decode((AttributeMap)ctx, in, out);
-    }
-
-//    @Override
     void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
         in.resetReaderIndex();
         //Common decoding part
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java
index 88afa29c..c22d203e 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java
@@ -35,11 +35,6 @@ class PublishDecoder extends DemuxDecoder {
     private static Logger LOG = LoggerFactory.getLogger(PublishDecoder.class);
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
-        decode((AttributeMap)ctx, in, out);
-    }
-    
-//    @Override
     void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         LOG.info("decode invoked with buffer {}", in);
         in.resetReaderIndex();
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java
index d2f4c5cf..b8d26945 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java
@@ -16,7 +16,7 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeMap;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
@@ -28,7 +28,7 @@ import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
 class SubAckDecoder extends DemuxDecoder {
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         //Common decoding part
         in.resetReaderIndex();
         SubAckMessage message = new SubAckMessage();
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java
index 0830d43b..4cdd6704 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java
@@ -16,8 +16,8 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
@@ -30,7 +30,7 @@ import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
 class SubscribeDecoder extends DemuxDecoder {
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         //Common decoding part
         SubscribeMessage message = new SubscribeMessage();
         in.resetReaderIndex();
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java
index bb86f669..a5f79aee 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java
@@ -16,8 +16,8 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.util.AttributeMap;
 import java.util.List;
 import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
@@ -29,7 +29,7 @@ import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
 class UnsubscribeDecoder extends DemuxDecoder {
 
     @Override
-    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
         //Common decoding part
         in.resetReaderIndex();
         UnsubscribeMessage message = new UnsubscribeMessage();