Some refactors to dice service