Bump deps.
Templating some of the hierarchy