Expand resource map, add endpoints for groups