Add first class terms and ontology annotation