Added credit card type
Updated date criteria