Now uses factory in template forms