Added arithmetics support