DataMapping + some ontology performance fixes