Connector Improvements