Adding hook handler to this branch