Adjusted code for connector flavors.