District new connectors from Marco's fork.