Imrove auto-discovery