Adding expressions to conditional logic