Data structure changed to avoid file names copying