Initial draft for review - SMatrix saga support