Started implementing autodiscovery feature