Added option to return list of filenames with path