added data fields to templates