Add file full path in the output mapping file, and add options to control it