Fix templates
Use entities