add condition support