Updated to latest (new file loaders)