Changes to support all 3 groups user ids