Improving the coverage of Deck