Working on the extraction feature