Update to file_load and views