Update with the latest SS.Interfaces refactoring