Move to netty