Hooks api (16/23)

Hooks api