Changes to integrate new SusyNtSys