added groups support