Changes for RDF with distribution - not ready yet