Revert extractList to extractAll