Implement the new format for the variables in Freemarker and Velocity