Updated/New Composer support for HTML_Table_Matrix

See diff for full changes