diff --git a/src/main/java/edu/isi/oba/MapperSchema.java b/src/main/java/edu/isi/oba/MapperSchema.java
index bb97f71..681e774 100644
--- a/src/main/java/edu/isi/oba/MapperSchema.java
+++ b/src/main/java/edu/isi/oba/MapperSchema.java
@@ -192,15 +192,10 @@ private Map<String, Schema> getDataProperties() {
     				}
 
     				if (inspect) {
-    					Boolean isFunctional = false;
+						boolean isFunctional = EntitySearcher.isFunctional(odp, this.ontologies.stream());
+
     					for (OWLOntology ontology: this.ontologies) {
     						ranges.addAll(ontology.getDataPropertyRangeAxioms(odp));
-    						functional = ontology.getAxioms(AxiomType.FUNCTIONAL_DATA_PROPERTY);
-    						for (OWLFunctionalDataPropertyAxiom functionalAxiom:functional) {
-    							if (functionalAxiom.getProperty().equals(odp)) {
-									isFunctional = true;
-								}
-    						}
     					}
 
     					if (ranges.isEmpty()) {
@@ -321,17 +316,11 @@ private Map<String, Schema> getObjectProperties() {
         			}
 
         			if (inspect) {
-        				Boolean isFunctional = false;
+						boolean isFunctional = EntitySearcher.isFunctional(odp, this.ontologies.stream());
+
         				Set<OWLObjectPropertyRangeAxiom> ranges = new HashSet<>();
         				for (OWLOntology ontology: this.ontologies) {
         					ranges.addAll(ontology.getObjectPropertyRangeAxioms(odp));
-
-        					functional = ontology.getAxioms(AxiomType.FUNCTIONAL_OBJECT_PROPERTY);
-        					for (OWLFunctionalObjectPropertyAxiom functionalAxiom:functional) {
-        						if (functionalAxiom.getProperty().equals(odp)) {
-        							isFunctional = true;
-        						}
-        					}
         				}
 
         				if (ranges.isEmpty()) {