Improve selector