Update with latest SS refactor