Changes to use new core templates