Added hooks support