Add SelectStrategy without tests!