Use updated template rules