Adding support for conditional expressions