Increase scope of GDS builder