Refactoring SST