PR for affinity group API