Updated Card class