Improved ontology helpers