Rever last commit
Explicity attribute templates marks