Added more arithmetic functionality