Rework server architecture to support private