Added proper group fetching from server