Add groups fetching