templates enhancement