added additional group support