new template entity class, new design
header fix