added persistent server/channel handling