Increased different card numbers support