Changes on templates