Edited Freemarker templates to correct for new model