Changes to support restructuring of connector