Add return of file_storage_nm