SMath Engineering Enhancements