Improved RDF analysis to be easier to setup