added support to conditional expressions