Added groups and group relationships