Archive refactor.