Improved selector performance