MAJOR CHNAGE: Generic Connector - Concept.