updated templates and template managers