Added basic feature extraction.