Add support for hooks
Review the f.a.q.