More progress on the connector server