Changes to implement stable RDF mapping