Start using Key and KeyRing wrappers in the code