ChargePoint has a new plug system for its charging stations that will make it easier for EV drivers to select the correct connecter for their electric vehicle. The new plug, called Omni Port, works by automatically installing an adapter (or excluding one) to the tip of the connector when you’re ready to charge, which means Tesla owners won’t need to bring out their adapter.

In a press release, ChargePoint CEO Rick Wilmer says Omni Port solves “the challenges associated with a multiple connector environment” and gives Tesla and non-Tesla drivers a “world-class” experience. As North American automakers transition to use the new NACS standard that’s based on Tesla’s connector, current drivers will continue needing access to J1772 Level 2 ports as well as CCS1 ports for DC fast charging. Yeah, charging is kind of a mess.

Omni Ports are shipping by the end of the year and will be included on new station hardware, including ones with support for 800-volt charging. Meanwhile, owners of ChargePoint’s commercial CP6000 and Express Plus Power Link 2000 stations can get an Omni Port retrofit, thanks to a modular design. However, don’t expect them to include the nearly extinct CHAdeMO port (although there might still be hope for Leaf owners).