Updating the template with more fields and definitions