Improved hook integration.