[TASK] Change the internals of the extraction