Schema Update & minor update on point function