Changes related to maths library