Archive and index enhancement