Add auto-discovery