Added feature extraction