Add in class for feature extraction