Refactored out Connector and DomainPort data.