Updated Deck class