Add support for hooks