Reorganized NodeConnector generic