Fix defect – minor
Refactor – minor
Support ^ variable substitution in many parameters