Update to use latest versions, and data-hook.

Keeping up with best practices