add set and cluster class