Move more gss logic into gss mixin