Added new types of substitutions to move more static parts into template.