Added more uniary operator support