Add support for +, -, *, / and %