Added user group support