Refactored selection handler