added more template fields
added more template fields