Update to latest re-factored SS.Interfaces