Added substitution variable support.