DCS-9: Connector class added.
DCS-9: Unnecessary classes removed.