Added support for Case When Structure