updating gss builders to move base functionality into abstract gss builder and making the two implementation builders more lean