Multiple changes to connectors, and queries
few changes to sort out merge