Adjusted RDFDataUnitHelper according to doc