Added some initial code for feature extractor