Adding better unary condition support