Server rework with Connector Clients (not tested)