Add the option to extract with same structure