Templating some new classes