Changes for gcsaa-groups version