Missing templates declaration
Correction of templates declaration
Simplification