Deck deal keys refactoring