BaseConnector -> AConnector; some cleanup