Added the beginnings of a new way to store certificates and related attributes