JAVA-1215: Reorganized methods in CountModel
JAVA-1215: Replaced use of Find in DistinctOperation with properties