NetworkChannelHandler changes