Improve management of Anyone group