Adding cluster-point extraction