Better arithmetic support