One-off update to add autodiscovery