Some improvements on the templates part