Minor changes for Library and FilesLoader