Added more file loading functionality