Add Card class
Fix card count&set handling