Update API for new clustering changes.