Follows changes to GDS