Major key-management revision.