Added configuration-based discovery