Added the possibility to support of unary operators