Added support for unary and binary operators