Please find two patches for the ticket: https://fedorahosted.org/pki/ticket/1307 [RFE] Support multiple keySets for different cards for ExternalReg Patch pki-cfu-0066 involves only renaming of classes/methods/parameters and the related config parameters for the Mapping Resolver framework. (note: after the refactoring, I tested it to work before continuing to the 2nd part) It is separated out from the actual code logic changes for ease of review. The renaming is necessary as the original framework was intended only to be used to resolve tokenType, and it is now expanded to be used to resolve keySet. Patch pki-cfu-0067 deals with the actual code changes that adds support for keySet mapping Original design of this add-on ExternalReg feature can be found here: http://pki.fedoraproject.org/wiki/TPS_-_New_Recovery_Option:_External_Regist... There is no upgrade supported at this point, as this is technology preview feature. Please review. thanks, Christina