Add management of hooks