Added feature detection.