Added role group support