Add checking for arithmetic types