Better feature detection.