Add auto-selection functionality