InFileRepository refactoring