Moving some methods back to AbstractRDFDataUnit from subclasses