Integrate the new math lib