Add the support of `and' and `or' form