Changing over to using the generic templates.