Added the classes for the new template language.