Much improved archive API.