Adding support for creating and deleting affinity groups