Updated MathFramework