Updated RDF mappings & addded underscore