Reverted low-lovel handling as the ontology is needed during the finalization.