Added Auto-discovery feature