Add support for custom hooks in hooks folder
Improve custom hooks