Updated Netty implementation