Optimize selector library