Added reference and disjunction handling