Started on refactoring Hook Management