GSS support now working