Changed templates to use the new parameters.