- Rework hooks API's