Added wiring connector support