Changes to ChannelHandler