Refactored gss constraints