New hooks and update documentation