clustering and api updates