Refactor to allow adding wires from config script