Added hooks handling.