- Add discoverability for units