Adding features and feature extractor WIP