Modify RDF API to expose as public api