Added template form
Separated methods
Added Template form factory