Update to refactored SS.Interfaces