adapted mapper service to new ontology