Feature extractor updated for consistency