Moved to a class structure for feature extractors