Updated/New Composer support for Math_Matrix

See diff for full changes