Added field data and updated template for several entities