Added feature extraction.