adding gs collections support