Small changes on templates