DataMapping + Ontology performance fixes