Added extract_dir