Added scaffolding for feature extraction