Updated Card Class