Updated code so that information on accessing each certificate for different kinds of cards is not shared