- Add ChannelOption
- Move package