Update for the move of the buffer to the FileLoader and FileSaver