Expand Dice and use pimpl pattern