Updated/New Composer support for Math_RPN

See diff for full changes