Updated project to use Freemarker