0012121: Optimization of existing selection classes