Implemented correctly the new template files