partial add Hooks API
minor Hooks changes