Improved FilesManager class