Trying to keeping up with new changes in file_manager