Minor refactor to switch to the archive module.