Shouldn't this change also include moving group from global part to the backend?