Better support for return fields and expressions
Made StringCondition reference a field instance