FileSupplier put in use + refactoring