Re-extract interface for FileSystemRepository...