Consolidate freemarker use into single file where used for obtaining factory methods / #SDT-41 Fixed