Updating for refactored connector code