Updated/New Composer support for Math_TrigOp

See diff for full changes