Added hooks, removed activator/deactivator