Data extractions improvements