Revised RDF wrapping