updates for latest connector architecture