Added groups definitions