[Calculator] Update Calculator Functions.