FilesManager Improvements