Adjust templates to reflect API changes