Moved group management to API