Improving Die and Dice classes