Added checks for all hooks