Added CardType and some other properties