Enhanced Card and Deck functionality