Added new libraries, changed the ontology and minor fixes