added groups and scenarios