Add optimizations to Selectors class