Last modifications on the files marshaller