Update more intelligence in the base template