WIP rdf datastream
Merge rdf branch