Updated all Hooks to work with new ontology format; RETHINKING of performance collection - NOT READY YET