Update for new GS interface