Added expression condition support