Finish wiring up autodiscovery