Updated templates with entities