Added more to the archive loader.