Change: Moved FeatureExtraction to intern