Add clustering counting and CountClusterMapper