Templates improved