Refactor of channelGroup persistence code