Added Deck handling