Improve freemarker support