Update to add the new hook system