Refactoring probability provider to be count provider generic