Template change

Modified the template, added some additional fields