JZ: Match more pdb variants