More general updates and templating.