Moved connector expansion to the options class.