Added binop and uniop validation