Now creates group when not exists