Improve of template properties